@sparkle-learning/core 0.0.53 → 0.0.55

package/dist/cjs/header-mobile-collapse_61.cjs.entry.js

@@ -13,19 +13,22 @@ const index$3 = require('./index-9c7b27e4.js');
 const dir = require('./dir-5af5259a.js');
 const spinnerConfigs = require('./spinner-configs-0ac05f2d.js');
 const activeRouter = require('./active-router-f9e18bd8.js');
-const PrivateRoute = require('./PrivateRoute-074c584e.js');
-const assets_service = require('./assets.service-0c759d51.js');
+const PrivateRoute = require('./PrivateRoute-f97245ce.js');
+const assets_service = require('./assets.service-bfa75092.js');
 const auth_store = require('./auth.store-1e630a7d.js');
-const student_service = require('./student.service-2e58f237.js');
-const environmentConfig_service = require('./environment-config.service-0e02b049.js');
-const util = require('./util-d383acb8.js');
-const facilitator_service = require('./facilitator.service-9e990274.js');
+const student_service = require('./student.service-7e5385be.js');
+const environmentConfig_service = require('./environment-config.service-c8ff1f3d.js');
+const util = require('./util-47e320b2.js');
+const facilitator_service = require('./facilitator.service-ff0e1659.js');
 const index$4 = require('./index-15ea05f5.js');
 const overlays = require('./overlays-32df265a.js');
-const signalR_service = require('./signalR.service-5672eebc.js');
-const httpService = require('./httpService-7211d93b.js');
-const feed_service = require('./feed.service-b4f09441.js');
-require('./localstorage.service-6346a41d.js');
+const signalR_service = require('./signalR.service-bd6b42f9.js');
+const httpService = require('./httpService-d2e7bf8f.js');
+const appdata_service = require('./appdata.service-c8d71e05.js');
+const feed_service = require('./feed.service-8eca4de6.js');
+const media_service = require('./media.service-8a1b9bc5.js');
+const localstorage_service = require('./localstorage.service-6346a41d.js');
+const token_service = require('./token.service-7a41953d.js');
 require('./hardware-back-button-92d97ff8.js');
 require('./animation-ee586546.js');
 
@@ -3069,7 +3072,7 @@ const SparkleCourseRoot = class {
     this.config = {
       appUrl: 'http://localhost:3333',
       globalAssetsUrl: 'http://localhost:3333/assets',
-      apiUrl: 'https://localhost:44399/',
+      apiUrl: 'https://localhost:44369/',
       quizPath: this.quizPath,
       tocPath: this.tocPath,
       menu: {
@@ -3118,6 +3121,10 @@ const SparkleCourseRoot = class {
     var sidebar = document.getElementById('onlineStudents');
     await sidebar.show();
   }
+  useDidLogin(event) {
+    console.log('Received the userDidLogInevent: ', event.detail);
+    return index.h("stencil-router-redirect", { url: "/home" });
+  }
   renderPage(path) {
     return (index.h("stencil-route", { url: '/' + path, routeRender: props => [
         this.renderHeaderAndMenu(),
@@ -12543,7 +12550,7 @@ const FacilitatorPage = class {
     }
     path = /^\/docs\/pages\/[a-z]{2}\.json$/.test(path) ? path.replace('.json', '/index.json') : path;
     let lessonPath = this.getLessonPath(path);
-    console.log(lessonPath);
+    console.log("lessonPath", lessonPath);
     return fetch(path).then(this.validateFetch).then(this.handleNotesPage).catch(this.handleBadFetch) &&
       fetch(lessonPath).then(this.validateFetch).then(this.handleLessonNotesPage).catch(this.handleLessonNotesBadFetch);
   }
@@ -12556,7 +12563,7 @@ const FacilitatorPage = class {
     if (path === null || path === oldPath) {
       return;
     }
-    if (signalR_service.SignalRService.getInstance().connection.connectionState == "Connected") {
+    if (signalR_service.SignalRService.getInstance().connection._connectionState == "Connected") {
       signalR_service.SignalRService.getInstance().callSignalR("NavigateFacilitatorPresentationCourseTo", { url: this.path.replace(".json", "") });
     }
     path = /^\/docs\/pages\/[a-z]{2}\.json$/.test(path) ? path.replace('.json', '/index.json') : path;
@@ -12632,7 +12639,6 @@ const FacilitatorPage = class {
     return index.h(Template, { page: notesPage });
   }
   __stencil_render() {
-    console.log(facilitator_service.facilitatorStore.state.classes);
     const { page } = this;
     const content = this.renderTabs();
     return index.h("div", { class: "container" }, index.h("div", { class: "d-flex justify-content-between align-items-center" }, index.h("sparkle-page-footer", { page: page }), index.h("div", null, index.h("select", { class: "form-select", "aria-label": "Default select example" }, facilitator_service.facilitatorStore.state.classes.map(item => index.h("option", null, item.ClassName))))), content);
@@ -12796,7 +12802,7 @@ const SparkleGoals = class {
     index.registerInstance(this, hostRef);
   }
   async componentDidLoad() {
-    await feed_service.AppDataService.getInstance().getAllGoals();
+    await appdata_service.AppDataService.getInstance().getAllGoals();
   }
   async presentAddGoalModal(appData) {
     const modal = await overlays.modalController.create({
@@ -12807,8 +12813,8 @@ const SparkleGoals = class {
     await modal.present();
   }
   render() {
-    return (index.h(index.Host, null, index.h("h2", null, "MY GOALS"), index.h("ion-item", { lines: "none" }, index.h("ion-button", { size: "default", color: "primary", slot: "end", onClick: () => this.presentAddGoalModal(null) }, index.h("ion-icon", { name: "add-outline" }), "Add")), index.h("div", { class: "ion-padding" }, index.h("sparkle-cards", null, feed_service.goalStore.state.goals.map((goal) => index.h("div", { style: { "position": "relative" } }, index.h("sparkle-goal-item", { goal: goal.AppData, onEditGoal: () => this.presentAddGoalModal(goal) })))), !feed_service.goalStore.state.goalsLoading && feed_service.goalStore.state.goals.length == 0
-      && index.h("div", { class: "text-center" }, "No Goals"), feed_service.goalStore.state.goalsLoading &&
+    return (index.h(index.Host, null, index.h("h2", null, "MY GOALS"), index.h("ion-item", { lines: "none" }, index.h("ion-button", { size: "default", color: "primary", slot: "end", onClick: () => this.presentAddGoalModal(null) }, index.h("ion-icon", { name: "add-outline" }), "Add")), index.h("div", { class: "ion-padding" }, index.h("sparkle-cards", null, appdata_service.goalStore.state.goals.map((goal) => index.h("div", { style: { "position": "relative" } }, index.h("sparkle-goal-item", { goal: goal.AppData, onEditGoal: () => this.presentAddGoalModal(goal) })))), !appdata_service.goalStore.state.goalsLoading && appdata_service.goalStore.state.goals.length == 0
+      && index.h("div", { class: "text-center" }, "No Goals"), appdata_service.goalStore.state.goalsLoading &&
       index.h("div", { class: "text-center" }, index.h("ion-spinner", { name: "dots" })))));
   }
 };
@@ -12979,39 +12985,6 @@ const SparkleHeader = class {
 };
 SparkleHeader.style = headerCss;
 
-const { state, reset } = auth_store.createStore({
-  mediaUploading: false,
-});
-const mediaStore = { state, reset };
-
-class MediaService {
-  constructor() { }
-  static getInstance() {
-    if (!MediaService.instance) {
-      MediaService.instance = new MediaService();
-    }
-    return MediaService.instance;
-  }
-  async uploadImage(files) {
-    let formData = new FormData();
-    for (let i = 0; i < files.length; i++) {
-      formData.append("uploads[]", files[i], files[i].name);
-    }
-    mediaStore.state.mediaUploading = true;
-    let result;
-    try {
-      result = await httpService.HttpService.http.post(`api/v1/MediaItems/Upload`, formData);
-      if (result) {
-        mediaStore.state.mediaUploading = false;
-      }
-    }
-    catch (e) {
-      mediaStore.state.mediaUploading = false;
-    }
-    return result;
-  }
-}
-
 const sparkleHealthCss = ":host{display:block}.health-image{display:block;max-width:300px;max-height:200px;width:auto;height:auto}";
 
 const SparkleHealth = class {
@@ -13042,7 +13015,7 @@ const SparkleHealth = class {
     this.submitted = true;
     console.log(event.target.files);
     if (event.target.files && event.target.files[0]) {
-      const result = await MediaService.getInstance().uploadImage(event.target.files);
+      const result = await media_service.MediaService.getInstance().uploadImage(event.target.files);
       if (result.Succeeded && result.Data && result.Data.length > 0) {
         this.uploadedImageUrl = result.Data[0].FullImageUrl;
         console.log(this.uploadedImageUrl);
@@ -13053,7 +13026,7 @@ const SparkleHealth = class {
     this.el.querySelector("#fileInput").click();
   }
   render() {
-    return (index.h(index.Host, null, index.h("div", null, index.h("h3", null, "MY HEALTH"), index.h("p", null, "This mini-app will help girls develop and instil good physical health habits"), index.h("ion-list", null, index.h("ion-list-header", null, "Select Heart Rate"), index.h("ion-item", { lines: "none" }, index.h("ion-range", { min: 0, max: 150, step: 1, snaps: true, pin: true, onIonChange: (ev) => this.heartRate = +ev.detail.value }, index.h("ion-icon", { size: "small", slot: "start", name: "pulse" }), index.h("ion-icon", { name: "pulse", size: "small" }), index.h("div", { slot: "end" }, index.h("strong", null, this.heartRate)))), this.uploadedImageUrl && index.h("ion-item", { lines: "none" }, index.h("img", { class: "health-image", src: this.uploadedImageUrl })), index.h("ion-item", { lines: "none" }, index.h("input", { type: "file", id: "fileInput", onChange: (ev) => this.uploadImage(ev), style: { display: "none" }, accept: "image/*" }), index.h("div", null, index.h("ion-button", { onClick: () => this.selectFile(), disabled: mediaStore.state.mediaUploading }, mediaStore.state.mediaUploading && index.h("ion-spinner", { name: "dots" }), "Upload Image"))), index.h("ion-item", { lines: "none" }, index.h("ion-label", null, "Share to Community Wall"), index.h("ion-checkbox", { slot: "start", onChange: (ev) => this.public = ev.detail.checked, checked: true })), index.h("ion-item", { lines: "none" }, index.h("ion-button", { slot: "end", color: "primary", size: "default", onClick: () => this.postFeed(), disabled: mediaStore.state.mediaUploading || feed_service.feedStore.state.createPostLoading }, feed_service.feedStore.state.createPostLoading && index.h("ion-spinner", { name: "dots" }), " POST"))))));
+    return (index.h(index.Host, null, index.h("div", null, index.h("h3", null, "MY HEALTH"), index.h("p", null, "This mini-app will help girls develop and instil good physical health habits"), index.h("ion-list", null, index.h("ion-list-header", null, "Select Heart Rate"), index.h("ion-item", { lines: "none" }, index.h("ion-range", { min: 0, max: 150, step: 1, snaps: true, pin: true, onIonChange: (ev) => this.heartRate = +ev.detail.value }, index.h("ion-icon", { size: "small", slot: "start", name: "pulse" }), index.h("ion-icon", { name: "pulse", size: "small" }), index.h("div", { slot: "end" }, index.h("strong", null, this.heartRate)))), this.uploadedImageUrl && index.h("ion-item", { lines: "none" }, index.h("img", { class: "health-image", src: this.uploadedImageUrl })), index.h("ion-item", { lines: "none" }, index.h("input", { type: "file", id: "fileInput", onChange: (ev) => this.uploadImage(ev), style: { display: "none" }, accept: "image/*" }), index.h("div", null, index.h("ion-button", { onClick: () => this.selectFile(), disabled: media_service.mediaStore.state.mediaUploading }, media_service.mediaStore.state.mediaUploading && index.h("ion-spinner", { name: "dots" }), "Upload Image"))), index.h("ion-item", { lines: "none" }, index.h("ion-label", null, "Share to Community Wall"), index.h("ion-checkbox", { slot: "start", onChange: (ev) => this.public = ev.detail.checked, checked: true })), index.h("ion-item", { lines: "none" }, index.h("ion-button", { slot: "end", color: "primary", size: "default", onClick: () => this.postFeed(), disabled: media_service.mediaStore.state.mediaUploading || feed_service.feedStore.state.createPostLoading }, feed_service.feedStore.state.createPostLoading && index.h("ion-spinner", { name: "dots" }), " POST"))))));
   }
   get el() { return index.getElement(this); }
 };
@@ -13126,12 +13099,13 @@ const PageLogin = class {
     this.submitted = true;
     if (this.password.valid && this.username.valid) {
       //await UserData.login(this.username.value);
-      await PrivateRoute.AuthService.getInstance().authenticate({
+      let result = await PrivateRoute.AuthService.getInstance().authenticate({
         Email: this.username.value,
         Password: this.password.value,
         RememberClient: this.rememberMe.value
       });
-      sessionStorage.setItem('rememberMe', this.rememberMe.value == true ? '1' : '0');
+      console.log(result);
+      //sessionStorage.setItem('rememberMe', this.rememberMe.value == true ? '1' : '0');
       this.userDidLogIn.emit({ loginStatus: true });
     }
   }
@@ -13394,7 +13368,7 @@ const SparkleOnlineStudents = class {
 };
 SparkleOnlineStudents.style = onlineStudentsCss;
 
-const pageCss = ".Error{align-items:center;background-color:var(--offset-background);color:var(--text-color--light);display:flex;flex-direction:column;justify-content:center;line-height:1;white-space:nowrap}.Error.full-screen{padding-bottom:3rem}.Error>*{margin:10px}.Error h1,.Error div{color:inherit;font-size:3rem}.Error div{text-shadow:3px 3px 3px rgba(0,0,0,0.1)}.Error p{font-size:18px}sparkle-page{display:grid;font-size:16px;grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 1fr;line-height:2;margin-left:var(--page-margin-left);margin-top:var(--header-height);overflow-x:hidden;transform:var(--page-transform, none);transition:transform 200ms cubic-bezier(0.2, 1, 0.2, 1)}@media (min-width: 1234px){sparkle-page{grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 3fr}}@media (min-width: 1800px){sparkle-page{grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 1fr 240px}}sparkle-page>main{position:relative;grid-column:2;margin-bottom:3rem;padding:var(--page-padding, 2rem 1rem);position:relative}sparkle-page sparkle-pagination{grid-column:1 / -1}sparkle-page .full-screen{grid-column:1 / -1;height:calc(100vh - var(--header-height));margin-bottom:0;overflow:hidden;padding:0}sparkle-page .page-heading-encapsulation{text-transform:uppercase;background:transparent;color:#2d4665;border:1px solid #dee3ea;border-radius:14px;height:24px;padding:2px 8px;font-weight:600;font-size:10px;line-height:14px;display:inline-flex;align-items:center;align-self:center;justify-self:flex-end;letter-spacing:0.08em;float:right}sparkle-page .page-heading-encapsulation:hover{border-color:#92a1b3}sparkle-page h1{display:flex;justify-content:space-between;margin-top:2rem;margin-bottom:1rem}sparkle-page h2 a[href^='#'],sparkle-page h3 a[href^='#'],sparkle-page h4 a[href^='#'],sparkle-page h5 a[href^='#'],sparkle-page h6 a[href^='#']{color:inherit;position:relative}sparkle-page h2 a[href^='#']:before,sparkle-page h3 a[href^='#']:before,sparkle-page h4 a[href^='#']:before,sparkle-page h5 a[href^='#']:before,sparkle-page h6 a[href^='#']:before{content:'#';opacity:0;padding-right:5px;position:absolute;right:100%;transition:opacity 100ms ease}sparkle-page h2 a[href^='#']:hover:before,sparkle-page h3 a[href^='#']:hover:before,sparkle-page h4 a[href^='#']:hover:before,sparkle-page h5 a[href^='#']:hover:before,sparkle-page h6 a[href^='#']:hover:before{opacity:1}sparkle-page h2 code,sparkle-page h3 code,sparkle-page h4 code,sparkle-page h5 code,sparkle-page h6 code{background:none;font-size:inherit}sparkle-page aside{float:right;margin-left:20px;margin-bottom:20px}@media (min-width: 1234px){sparkle-page main.no-demo .page-meta{position:fixed;right:0;top:100px;width:240px;transition:0.2s transform ease}sparkle-header.hidden~stencil-route sparkle-page main.no-demo .page-meta{transform:translateY(-60px)}}sparkle-page main.has-demo .page-meta internal-ad{display:none}sparkle-page .controls{display:flex;justify-content:flex-end}";
+const pageCss = ".Error{align-items:center;background-color:var(--offset-background);color:var(--text-color--light);display:flex;flex-direction:column;justify-content:center;line-height:1;white-space:nowrap}.Error.full-screen{padding-bottom:3rem}.Error>*{margin:10px}.Error h1,.Error div{color:inherit;font-size:3rem}.Error div{text-shadow:3px 3px 3px rgba(0,0,0,0.1)}.Error p{font-size:18px}sparkle-page{display:grid;font-size:16px;grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 1fr;line-height:2;margin-left:var(--page-margin-left);margin-top:var(--header-height);overflow-x:hidden;transform:var(--page-transform, none);transition:transform 200ms cubic-bezier(0.2, 1, 0.2, 1)}@media (min-width: 1234px){sparkle-page{grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 3fr}}@media (min-width: 1800px){sparkle-page{grid-template-columns:1fr minmax(0, var(--page-width, 720px)) 1fr 240px}}sparkle-page>main{position:relative;grid-column:2;margin-bottom:3rem;padding:var(--page-padding, 2rem 1rem);position:relative}sparkle-page sparkle-pagination{grid-column:1 / -1}sparkle-page .full-screen{grid-column:1 / -1;height:calc(100vh - var(--header-height));margin-bottom:0;overflow:hidden;padding:0}sparkle-page .page-heading-encapsulation{text-transform:uppercase;background:transparent;color:#2d4665;border:1px solid #dee3ea;border-radius:14px;height:24px;padding:2px 8px;font-weight:600;font-size:10px;line-height:14px;display:inline-flex;align-items:center;align-self:center;justify-self:flex-end;letter-spacing:0.08em;float:right}sparkle-page .page-heading-encapsulation:hover{border-color:#92a1b3}sparkle-page h1{display:flex;justify-content:space-between;margin-top:2rem;margin-bottom:1rem}sparkle-page h2 a[href^='#'],sparkle-page h3 a[href^='#'],sparkle-page h4 a[href^='#'],sparkle-page h5 a[href^='#'],sparkle-page h6 a[href^='#']{color:inherit;position:relative}sparkle-page h2 a[href^='#']:before,sparkle-page h3 a[href^='#']:before,sparkle-page h4 a[href^='#']:before,sparkle-page h5 a[href^='#']:before,sparkle-page h6 a[href^='#']:before{content:'#';opacity:0;padding-right:5px;position:absolute;right:100%;transition:opacity 100ms ease}sparkle-page h2 a[href^='#']:hover:before,sparkle-page h3 a[href^='#']:hover:before,sparkle-page h4 a[href^='#']:hover:before,sparkle-page h5 a[href^='#']:hover:before,sparkle-page h6 a[href^='#']:hover:before{opacity:1}sparkle-page h2 code,sparkle-page h3 code,sparkle-page h4 code,sparkle-page h5 code,sparkle-page h6 code{background:none;font-size:inherit}sparkle-page aside{float:right;margin-left:20px;margin-bottom:20px}@media (min-width: 1234px){sparkle-page main.no-demo .page-meta{position:fixed;right:0;top:100px;width:240px;transition:0.2s transform ease}sparkle-header.hidden~stencil-route sparkle-page main.no-demo .page-meta{transform:translateY(-60px)}}sparkle-page main.has-demo .page-meta internal-ad{display:none}sparkle-page .controls{display:flex;justify-content:flex-end}.controls ion-button ion-icon{color:#fff}";
 
 const SparklePage = class {
   constructor(hostRef) {
@@ -13403,7 +13377,15 @@ const SparklePage = class {
     this.presentation = false;
     this.page = { title: null, path: null, body: null, pageInfo: null };
     this.isLesson = false;
-    this.handleFacilitatorNavigationChange = (url) => {
+    this.eventEmitter = (user, data) => {
+      let event = new CustomEvent('receivedSignalREvent', { detail: JSON.parse(data) });
+      document.body.dispatchEvent(event);
+    };
+    this.pollSubmissionEventEmitter = (type, data) => {
+      let event = new CustomEvent('receivedPollSubmissionSignalREvent', { detail: { data: data, type: type } });
+      document.body.dispatchEvent(event);
+    };
+    this.handleFacilitatorNavigationChange = url => {
       this.history.replace(url, {});
     };
     this.validateFetch = (response) => {
@@ -13416,7 +13398,7 @@ const SparklePage = class {
       this.badFetch = null;
       this.page = page;
       if (this.presentation) {
-        this.page = Object.assign(Object.assign({}, this.page), { previousUrl: "/presentation" + this.page.previousUrl, nextUrl: "/presentation" + this.page.nextUrl });
+        this.page = Object.assign(Object.assign({}, this.page), { previousUrl: '/presentation' + this.page.previousUrl, nextUrl: '/presentation' + this.page.nextUrl });
       }
       StoreService.getInstance().UpdateTocPageInfo(this.page.pageInfo);
       this.isLesson = this.page.pageInfo.pageId > 0;
@@ -13428,7 +13410,7 @@ const SparklePage = class {
         title: error.statusText,
         body: null,
         path: null,
-        pageInfo: null
+        pageInfo: null,
       };
     };
   }
@@ -13439,19 +13421,25 @@ const SparklePage = class {
   }
   componentDidLoad() {
     if (this.presentation) {
-      signalR_service.signalRStore.onChange("connected", (connected) => {
+      signalR_service.signalRStore.onChange('connected', connected => {
         if (connected) {
-          signalR_service.SignalRService.getInstance().connection.on("NavigateFacilitatorPresentationCourseTo", this.handleFacilitatorNavigationChange);
+          signalR_service.SignalRService.getInstance().connection.on('SendMessage', this.eventEmitter);
+          signalR_service.SignalRService.getInstance().connection.on('NavigateFacilitatorPresentationCourseTo', this.handleFacilitatorNavigationChange);
+          signalR_service.SignalRService.getInstance().connection.on('PollSubmission', this.pollSubmissionEventEmitter);
+        }
+        else {
+          signalR_service.SignalRService.getInstance().connection.off('SendMessage', this.eventEmitter);
+          signalR_service.SignalRService.getInstance().connection.off('PollSubmission', this.eventEmitter);
+          signalR_service.SignalRService.getInstance().connection.off('NavigateFacilitatorPresentationCourseTo', this.handleFacilitatorNavigationChange);
         }
       });
     }
   }
   fetchPage(path, oldPath) {
-    if (signalR_service.SignalRService.getInstance().connection.connectionState == "Connected") {
-      signalR_service.SignalRService.getInstance().callSignalR("OnStudentNavigate", { url: window.location.href });
+    if (signalR_service.SignalRService.getInstance().connection._connectionState == 'Connected') {
+      signalR_service.SignalRService.getInstance().callSignalR('OnStudentNavigate', { url: window.location.href });
       if (this.presentation) {
-        console.log('register listener');
-        signalR_service.SignalRService.getInstance().connection.on("NavigateFacilitatorPresentationCourseTo", this.handleFacilitatorNavigationChange);
+        signalR_service.SignalRService.getInstance().connection.on('NavigateFacilitatorPresentationCourseTo', this.handleFacilitatorNavigationChange);
       }
     }
     if (path === null || path === oldPath) {
@@ -13522,7 +13510,7 @@ const SparklePage = class {
   async presentFeedbackModal() {
     const modal = await overlays.modalController.create({
       component: 'sparkle-feedback',
-      cssClass: 'sparkle-modal sparkle-feedback-modal'
+      cssClass: 'sparkle-modal sparkle-feedback-modal',
     });
     await modal.present();
   }
@@ -13553,29 +13541,28 @@ const SparklePage = class {
           text: 'Cancel',
           role: 'cancel',
           cssClass: 'secondary',
-          handler: () => {
-          }
-        }, {
+          handler: () => { },
+        },
+        {
           text: 'Ok',
-          handler: (data) => {
-          }
-        }
-      ]
+          handler: data => { },
+        },
+      ],
     });
     await alert.present();
   }
   openWindows() {
     //this.jwtService.updateDefaultCourseClassId(data);
-    window.open(window.location.origin + "/presentation" + this.path.replace(".json", ""), "_blank");
+    window.open(window.location.origin + '/presentation' + this.path.replace('.json', ''), '_blank');
     setTimeout(() => {
-      window.open(window.location.origin + "/presentation" + '/teacher' + this.path.replace(".json", ""), "_blank");
+      window.open(window.location.origin + '/presentation' + '/teacher' + this.path.replace('.json', ''), '_blank');
     }, 500);
   }
   renderControls() {
     if (auth_store.AuthStore.state.isAuthenticated) {
-      return (index.h("div", { class: "controls" }, index.h("ion-button", { onClick: () => this.presentFeedbackModal() }, index.h("ion-icon", { name: "chatbox-outline" })), this.isLesson && student_service.userStore.state.user && student_service.userStore.state.user.Roles.indexOf('Facilitator') > -1 && index.h("ion-button", { onClick: () => this.openProjectorPage() }, index.h("ion-icon", { name: "desktop-outline" }))));
+      return (index.h("div", { class: "controls" }, index.h("ion-button", { onClick: () => this.presentFeedbackModal() }, index.h("ion-icon", { name: "chatbox-outline" })), this.isLesson && student_service.userStore.state.user && student_service.userStore.state.user.Roles.indexOf('Facilitator') > -1 && (index.h("ion-button", { onClick: () => this.openProjectorPage() }, index.h("ion-icon", { name: "desktop-outline" })))));
     }
-    return "";
+    return '';
   }
   __stencil_render() {
     if (this.path) {
@@ -13585,12 +13572,12 @@ const SparklePage = class {
       }
       const Template = templates[page.template] || templates.default;
       const content = [
-        index.h("main", { class: 'no-demo' }, this.renderControls(), index.h(Template, { page: page }))
+        index.h("main", { class: 'no-demo' }, this.renderControls(), index.h(Template, { page: page })),
       ];
       return content;
     }
     else {
-      return index.h("main", { class: 'no-demo' }, index.h("slot", null));
+      return (index.h("main", { class: 'no-demo' }, index.h("slot", null)));
     }
   }
   static get watchers() { return {
@@ -13752,22 +13739,24 @@ const SparkleRoot = class {
   constructor(hostRef) {
     index.registerInstance(this, hostRef);
     this.history = null;
-    this.handleStudentNavigationChange = (url) => {
+    this.handleStudentNavigationChange = url => {
       this.history.replace(url, {});
     };
   }
   async componentWillLoad() {
     PrivateRoute.setupConfig({
-      sparkle: Object.assign(Object.assign({}, this.config), { prod: true })
+      sparkle: Object.assign(Object.assign({}, this.config), { prod: true }),
     });
     //return Promise.reject();
     await httpService.HttpService.getInstance();
     await httpService.HttpService.init();
-    var sparkleConfig = environmentConfig_service.EnvironmentConfigService.getInstance().get('sparkle');
-    if (sparkleConfig && sparkleConfig.auth && sparkleConfig.auth.getToken()) {
+    let auth = await localstorage_service.get(token_service.AppConsts.AUTH_USER_LOCALSTORAGE);
+    console.log(auth);
+    //TODO: check expiry as well
+    if (auth && auth.JWToken) {
       auth_store.AuthStore.state.isAuthenticated = true;
     }
-    auth_store.AuthStore.onChange("isAuthenticated", async (isAuthenticated) => {
+    auth_store.AuthStore.onChange('isAuthenticated', async (isAuthenticated) => {
       if (isAuthenticated) {
         console.log('authenticated');
         await student_service.StudentService.getInstance().fetchUserConfiguration();
@@ -13779,8 +13768,8 @@ const SparkleRoot = class {
     //SignalRAspNetCoreHelper.initSignalR();
   }
   componentDidLoad() {
-    signalR_service.SignalRService.getInstance().connection.on("NavigateStudentTo", this.handleStudentNavigationChange);
-    auth_store.AuthStore.onChange("isAuthenticated", async (isAuthenticated) => {
+    signalR_service.SignalRService.getInstance().connection.on('NavigateStudentTo', this.handleStudentNavigationChange);
+    auth_store.AuthStore.onChange('isAuthenticated', async (isAuthenticated) => {
       if (isAuthenticated) {
         signalR_service.SignalRService.getInstance().start();
       }
@@ -14085,7 +14074,7 @@ const SparkleUserProfile = class {
   }
   async uploadProfileImage(event) {
     if (event.target.files && event.target.files[0]) {
-      const result = await MediaService.getInstance().uploadImage(event.target.files);
+      const result = await media_service.MediaService.getInstance().uploadImage(event.target.files);
       if (result.Succeeded && result.Data && result.Data.length > 0) {
         this.changeFormValue("ProfileImage", result.Data[0].FullImageUrl);
         await this.updateUser();
@@ -14096,7 +14085,7 @@ const SparkleUserProfile = class {
     this.el.querySelector("#fileInput").click();
   }
   render() {
-    return (index.h(index.Host, null, index.h("ion-card", { color: "sparkle" }, index.h("div", { class: "img-wrapper" }, index.h("img", { class: mediaStore.state.mediaUploading ? "loading" : '', src: this.profileFormControls.ProfileImage.value || index.getAssetPath(`../assets/svg/profile.svg`) }), index.h("input", { type: "file", id: "fileInput", onChange: (ev) => this.uploadProfileImage(ev), style: { display: "none" }, accept: "image/*" }), index.h("ion-button", { color: "sparkle", onClick: () => this.selectFile(), disabled: mediaStore.state.mediaUploading }, index.h("ion-icon", { slot: "icon-only", name: "camera-outline" })), mediaStore.state.mediaUploading && index.h("ion-spinner", { class: "image-upload-loading", name: "dots" })), index.h("ion-card-content", { class: "ion-text-center" }, index.h("h2", null, this.profileFormControls.FirstName.value, " ", this.profileFormControls.LastName.value), index.h("h3", null, this.profileFormControls.ProfileText.value))), index.h("form", { onSubmit: e => this.handleProfileFormSubmit(e), novalidate: true }, index.h("ion-list", { "no-lines": true }, index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "First Name"), index.h("ion-input", { name: "firstName", type: "text", value: this.profileFormControls.FirstName.value, onInput: (ev) => this.changeFormValue("FirstName", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.FirstName.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "First Name is required")), index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "Last Name"), index.h("ion-input", { name: "lastName", type: "text", value: this.profileFormControls.LastName.value, onInput: (ev) => this.changeFormValue("LastName", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.LastName.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "Last Name is required")), index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "Profile Bio"), index.h("ion-input", { name: "lastName", type: "text", value: this.profileFormControls.ProfileText.value, onInput: (ev) => this.changeFormValue("ProfileText", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.ProfileText.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "Profile Bio is required"))), index.h("div", { class: "ion-padding" }, index.h("ion-button", { type: "submit", expand: "block", disabled: student_service.userStore.state.updateLoading }, student_service.userStore.state.updateLoading && index.h("ion-spinner", { name: "dots" }), " Update")))));
+    return (index.h(index.Host, null, index.h("ion-card", { color: "sparkle" }, index.h("div", { class: "img-wrapper" }, index.h("img", { class: media_service.mediaStore.state.mediaUploading ? "loading" : '', src: this.profileFormControls.ProfileImage.value || index.getAssetPath(`../assets/svg/profile.svg`) }), index.h("input", { type: "file", id: "fileInput", onChange: (ev) => this.uploadProfileImage(ev), style: { display: "none" }, accept: "image/*" }), index.h("ion-button", { color: "sparkle", onClick: () => this.selectFile(), disabled: media_service.mediaStore.state.mediaUploading }, index.h("ion-icon", { slot: "icon-only", name: "camera-outline" })), media_service.mediaStore.state.mediaUploading && index.h("ion-spinner", { class: "image-upload-loading", name: "dots" })), index.h("ion-card-content", { class: "ion-text-center" }, index.h("h2", null, this.profileFormControls.FirstName.value, " ", this.profileFormControls.LastName.value), index.h("h3", null, this.profileFormControls.ProfileText.value))), index.h("form", { onSubmit: e => this.handleProfileFormSubmit(e), novalidate: true }, index.h("ion-list", { "no-lines": true }, index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "First Name"), index.h("ion-input", { name: "firstName", type: "text", value: this.profileFormControls.FirstName.value, onInput: (ev) => this.changeFormValue("FirstName", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.FirstName.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "First Name is required")), index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "Last Name"), index.h("ion-input", { name: "lastName", type: "text", value: this.profileFormControls.LastName.value, onInput: (ev) => this.changeFormValue("LastName", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.LastName.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "Last Name is required")), index.h("ion-item", null, index.h("ion-label", { position: "stacked", color: "primary" }, "Profile Bio"), index.h("ion-input", { name: "lastName", type: "text", value: this.profileFormControls.ProfileText.value, onInput: (ev) => this.changeFormValue("ProfileText", ev.target.value) })), index.h("ion-text", { color: "danger" }, index.h("p", { hidden: this.profileFormControls.ProfileText.isValid || this.profileFormSubmitted === false, class: "ion-padding-start" }, "Profile Bio is required"))), index.h("div", { class: "ion-padding" }, index.h("ion-button", { type: "submit", expand: "block", disabled: student_service.userStore.state.updateLoading }, student_service.userStore.state.updateLoading && index.h("ion-spinner", { name: "dots" }), " Update")))));
   }
   get el() { return index.getElement(this); }
 };

package/dist/cjs/{httpService-7211d93b.js → httpService-d2e7bf8f.js}

@@ -2,7 +2,8 @@
 
 const auth_store = require('./auth.store-1e630a7d.js');
 const overlays = require('./overlays-32df265a.js');
-const environmentConfig_service = require('./environment-config.service-0e02b049.js');
+const environmentConfig_service = require('./environment-config.service-c8ff1f3d.js');
+const token_service = require('./token.service-7a41953d.js');
 
 var axios = auth_store.axios_1;
 
@@ -598,7 +599,7 @@ class HttpService {
     this.http = axios.create({
       baseURL: sparkleConfig.apiUrl,
       headers: {
-        'Content-Type': 'application/json'
+        'Content-Type': 'application/json',
       },
       timeout: 30000,
       paramsSerializer: function (params) {
@@ -607,9 +608,10 @@ class HttpService {
         });
       },
     });
-    this.http.interceptors.request.use(function (config) {
-      if (!!sparkleConfig && !!sparkleConfig.auth && !!sparkleConfig.auth.getToken()) {
-        config.headers.common['Authorization'] = 'Bearer ' + sparkle.auth.getToken();
+    this.http.interceptors.request.use(async function (config) {
+      let token = await token_service.TokenService.getInstance().getToken();
+      if (token) {
+        config.headers.common['Authorization'] = 'Bearer ' + token;
       }
       // //config.headers.common['.AspNetCore.Culture'] = sparkle.utils.getCookieValue('Sparkle.Localization.CultureName');
       config.headers.common['Sparkle.CourseId'] = sparkleConfig.courseId;
@@ -627,7 +629,7 @@ class HttpService {
       if (response.data.Message) {
         const toast = await overlays.toastController.create({
           message: response.data.Message,
-          duration: 3000
+          duration: 3000,
         });
         toast.present();
       }
@@ -638,7 +640,7 @@ class HttpService {
         // that falls out of the range of 2xx
         const toast = await overlays.toastController.create({
           message: error.response.data.ErrorMessage,
-          duration: 3000
+          duration: 3000,
         });
         toast.present();
         return Promise.reject(error);
@@ -648,7 +650,7 @@ class HttpService {
         // that falls out of the range of 2xx
         const toast = await overlays.toastController.create({
           message: error.response.data.Message,
-          duration: 3000
+          duration: 3000,
         });
         toast.present();
         return Promise.reject(error.response.data);
@@ -658,7 +660,7 @@ class HttpService {
         // that falls out of the range of 2xx
         const toast = await overlays.toastController.create({
           message: error.response.data.Message,
-          duration: 3000
+          duration: 3000,
         });
         toast.present();
         return Promise.reject(error);
@@ -671,8 +673,8 @@ class HttpService {
       }
       else {
         const toast = await overlays.toastController.create({
-          message: "Unknown Error",
-          duration: 3000
+          message: 'Unknown Error',
+          duration: 3000,
         });
         toast.present();
       }

package/dist/cjs/index.cjs.js

@@ -2,17 +2,18 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const PrivateRoute = require('./PrivateRoute-074c584e.js');
-const environmentConfig_service = require('./environment-config.service-0e02b049.js');
-const assets_service = require('./assets.service-0c759d51.js');
+const PrivateRoute = require('./PrivateRoute-f97245ce.js');
+const environmentConfig_service = require('./environment-config.service-c8ff1f3d.js');
+const assets_service = require('./assets.service-bfa75092.js');
 const auth_store = require('./auth.store-1e630a7d.js');
 require('./index-51e8292e.js');
 require('./localstorage.service-6346a41d.js');
-require('./httpService-7211d93b.js');
+require('./httpService-d2e7bf8f.js');
 require('./overlays-32df265a.js');
 require('./ionic-global-2cde9d3a.js');
 require('./hardware-back-button-92d97ff8.js');
 require('./helpers-c2496722.js');
+require('./token.service-7a41953d.js');