@sparkle-learning/core 0.0.18 → 0.0.22

package/dist/collection/services/httpService.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import qs from 'qs';
 import { toastController } from '@ionic/core';
 import { TocStore } from '../stores/toc.store';
+import { EnvironmentConfigService } from '.';
 export class HttpService {
   constructor() { }
   static getInstance() {
@@ -11,8 +12,9 @@ export class HttpService {
     return HttpService.instance;
   }
   static init() {
+    var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
     this.http = axios.create({
-      baseURL: sparkle.config.apiUrl,
+      baseURL: sparkleConfig.apiUrl,
       headers: {
         'Content-Type': 'application/json'
       },
@@ -24,11 +26,12 @@ export class HttpService {
       },
     });
     this.http.interceptors.request.use(function (config) {
-      if (!!sparkle && !!sparkle.auth.getToken()) {
+      if (!!sparkleConfig && !!sparkleConfig.auth && !!sparkleConfig.auth.getToken()) {
         config.headers.common['Authorization'] = 'Bearer ' + sparkle.auth.getToken();
       }
       // //config.headers.common['.AspNetCore.Culture'] = sparkle.utils.getCookieValue('Sparkle.Localization.CultureName');
-      config.headers.common['Sparkle.CourseId'] = sparkle.config.courseId;
+      config.headers.common['Sparkle.CourseId'] = sparkleConfig.courseId;
+      console.log(TocStore.state.pageInfo);
       if (TocStore.state.pageInfo) {
         config.headers.common['Sparkle.CourseModuleId'] = TocStore.state.pageInfo.courseModuleId;
         config.headers.common['Sparkle.SessionId'] = TocStore.state.pageInfo.sessionId;
@@ -58,6 +61,16 @@ export class HttpService {
         toast.present();
         return Promise.reject(error);
       }
+      else if (error.response && error.response.data && error.response.status == 400) {
+        // The request was made and the server responded with a status code
+        // that falls out of the range of 2xx
+        const toast = await toastController.create({
+          message: error.response.data.Message,
+          duration: 3000
+        });
+        toast.present();
+        return Promise.reject(error.response.data);
+      }
       else if (error.response && error.response.data && error.response.data.Message) {
         // The request was made and the server responded with a status code
         // that falls out of the range of 2xx

package/dist/collection/services/media.service.js

@@ -0,0 +1,29 @@
+import { HttpService } from './httpService';
+import mediaStore from '../stores/media.store';
+export 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.http.post(`api/v1/MediaItems/Upload`, formData);
+      if (result) {
+        mediaStore.state.mediaUploading = false;
+      }
+    }
+    catch (e) {
+      mediaStore.state.mediaUploading = false;
+    }
+    return result;
+  }
+}

package/dist/collection/services/signalR.service.js

@@ -0,0 +1,85 @@
+import * as signalR from '@microsoft/signalr';
+import { EnvironmentConfigService } from '.';
+import signalRStore from '../stores/signalR.store';
+export class SignalRService {
+  constructor() {
+    console.log("Starting signalR");
+    //TODO: update courseClassId
+    var defaultCourseClassId = 1;
+    var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
+    this.connection = new signalR.HubConnectionBuilder()
+      .withUrl(`${sparkleConfig.apiUrl}hubs/sparkle?url=${window.location.href}${defaultCourseClassId > 0 ? "&courseClassId=" + defaultCourseClassId : ""}`, {
+      accessTokenFactory: () => this.getToken(),
+      skipNegotiation: true,
+      transport: signalR.HttpTransportType.WebSockets
+    })
+      .configureLogging(signalR.LogLevel.Debug)
+      //.withAutomaticReconnect()
+      .withAutomaticReconnect({
+      nextRetryDelayInMilliseconds: retryContext => {
+        if (retryContext.elapsedMilliseconds < 60000) {
+          // If we've been reconnecting for less than 60 seconds so far,
+          // wait between 0 and 10 seconds before the next reconnect attempt.
+          return Math.random() * 10000;
+        }
+        else {
+          // If we've been reconnecting for more than 60 seconds so far, stop reconnecting.
+          return null;
+        }
+      }
+    })
+      .build();
+    this.connection.on("SendMessage", (user, data) => {
+      let payload = JSON.parse(data);
+      console.log("Server said ", user, payload);
+    });
+    this.connection.onclose(error => {
+    });
+    this.connection.onreconnecting(error => {
+      console.assert(this.connection.state === signalR.HubConnectionState.Reconnecting);
+    });
+    this.connection.onreconnected(connectionId => {
+      console.assert(this.connection.state === signalR.HubConnectionState.Connected);
+    });
+  }
+  static getInstance() {
+    if (!SignalRService.instance) {
+      SignalRService.instance = new SignalRService();
+    }
+    return SignalRService.instance;
+  }
+  async start() {
+    console.log("start");
+    try {
+      signalRStore.state.connecting = true;
+      signalRStore.state.connected = !signalRStore.state.connecting;
+      await this.connection.start();
+      console.log(this.connection);
+      signalRStore.state.connecting = false;
+      signalRStore.state.connected = !signalRStore.state.connecting;
+      console.assert(this.connection.state === signalR.HubConnectionState.Connected);
+      console.log("SignalR Connected.");
+    }
+    catch (err) {
+      console.assert(this.connection.state === signalR.HubConnectionState.Disconnected);
+      console.log(err);
+    }
+  }
+  ;
+  async callSignalR(hub, data) {
+    console.log('signalR invoke', hub, this.connection.connectionState);
+    if (!this.getToken()) {
+      console.log("Cannot connect to signalR. Not logged in");
+      return;
+    }
+    this.connection.invoke(hub, JSON.stringify(data));
+    console.log('After signalR invoke', hub, this.connection.connectionState);
+  }
+  getToken() {
+    var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
+    if (!!sparkleConfig && !!sparkleConfig.auth && !!sparkleConfig.auth.getToken()) {
+      return sparkle.auth.getToken();
+    }
+    return null;
+  }
+}

package/dist/collection/services/student.service.js

@@ -35,17 +35,18 @@ export class StudentService {
       userStore.state.user.ProfileImage = result.Data.ProfileImage;
       userStore.state.user.IsVerified = result.Data.IsVerified;
       userStore.state.user.Roles = result.Data.Roles;
+      userStore.state.user.FacilitatorClassList = result.Data.FacilitatorClassList;
     }
     return result;
   }
   async updateProfile(updateProfileInput) {
-    let result = await HttpService.http.post('api/Account/UpdateProfile', updateProfileInput);
-    // if (result) {
-    //     userStore.state.user.FirstName = result.Data.FirstName;
-    //     userStore.state.user.LastName = result.Data.LastName;
-    //     userStore.state.user.ProfileText = result.Data.ProfileText;
-    //     userStore.state.user.ProfileImage = result.Data.ProfileImage;
-    // }
+    userStore.state.updateLoading = true;
+    let result = await HttpService.http.post('api/Account/update-profile', updateProfileInput);
+    console.log('after fetch', result);
+    if (result) {
+      userStore.state.updateLoading = false;
+      userStore.state.user = Object.assign(Object.assign({}, userStore.state.user), { FirstName: result.Data.FirstName, LastName: result.Data.LastName, ProfileText: result.Data.ProfileText, ProfileImage: result.Data.ProfileImage });
+    }
     return result;
   }
   async submitFeedback(feedbackInput) {

package/dist/collection/stores/auth.store.js

@@ -2,7 +2,8 @@ import { createStore } from '@stencil/store';
 const { state, onChange, reset } = createStore({
   authUser: null,
   bearer: 'Bearer ',
-  isAuthenticated: false
+  isAuthenticated: false,
+  loading: false
 });
 onChange('authUser', (authUser) => {
   state.bearer = `Bearer ${authUser ? authUser.JWToken : ''}`;

package/dist/collection/stores/facilitator.store.js

@@ -1,6 +1,15 @@
 import { createStore } from '@stencil/store';
+;
 const { state, onChange } = createStore({
-  notes: [],
-  allNotes: []
+  pageNotes: [],
+  allPageNotes: [],
+  onlineStudents: [],
+  dashboardData: null,
+  isConnected: false,
+  loading: false,
+  dashboardDataLoading: false,
+  notesLoading: false,
+  classes: [],
+  classesLoading: false,
 });
 export default { state, onChange };

package/dist/collection/stores/feed.store.js

@@ -1,6 +1,8 @@
 import { createStore } from '@stencil/store';
 const { state, reset } = createStore({
   posts: [],
-  lastPageReached: false
+  postsLoading: false,
+  createPostLoading: false,
+  postIdLoading: null
 });
 export default { state, reset };

package/dist/collection/stores/goal.store.js

@@ -1,5 +1,7 @@
 import { createStore } from '@stencil/store';
 const { state, onChange } = createStore({
   goals: [],
+  goalsLoading: false,
+  goalLoading: false
 });
 export default { state, onChange };

package/dist/collection/stores/media.store.js

@@ -0,0 +1,5 @@
+import { createStore } from '@stencil/store';
+const { state, reset } = createStore({
+  mediaUploading: false,
+});
+export default { state, reset };

package/dist/collection/stores/signalR.store.js

@@ -0,0 +1,6 @@
+import { createStore } from '@stencil/store';
+const { state, onChange, reset } = createStore({
+  connecting: false,
+  connected: false
+});
+export default { state, onChange, reset };

package/dist/collection/stores/user.store.js

@@ -6,9 +6,11 @@ const { state, onChange, reset } = createStore({
     ProfileText: '',
     ProfileImage: '',
     IsVerified: false,
-    Roles: []
+    Roles: [],
+    FacilitatorClassList: []
   },
   loaded: false,
+  updateLoading: false,
   enrollmentList: [],
 });
 export default { state, onChange, reset };

package/dist/collection/util.js

@@ -1,3 +1,4 @@
+import { format } from 'date-fns';
 export function slugify(text) {
   return text.toLowerCase().replace(/[^\w]+/g, '-');
 }
@@ -13,17 +14,38 @@ export const debounce = (fn, wait) => {
     scheduled = setTimeout(fn, wait, ...args);
   };
 };
+export function GetGoalAppData(title, description, category, percentage, goalText) {
+  return {
+    Name: title,
+    Description: description,
+    Category: category,
+    Percentage: percentage,
+    GoalText: goalText
+  };
+}
 export function MyMoodTemplate(feeling, intensity, location) {
-  return `Mood : ${feeling} and Level: ${intensity} <gi-mood-image src="${location}"></gi-mood-image>`;
+  return `Mood : ${feeling} and Level: ${intensity} <img src="${location}" />`;
+}
+export function MyMoodTemplateJSON(feeling, intensity, location) {
+  return JSON.stringify({ Mood: feeling, Level: intensity, MoodImage: location });
 }
 export function MyHealthTemplate(heartRate) {
   return `Heart rate  ${heartRate} bpm`;
 }
+export function MyHealthTemplateJSON(heartRate) {
+  return JSON.stringify({ HearthRate: heartRate });
+}
 export function MyGoalTemplate(goalName, text, progress) {
   return `Goal update: ${goalName} ${text} Progress: ${progress}`;
 }
+export function MyGoalTemplateJSON(goalName, goalUpdateText, progress) {
+  return JSON.stringify({ GoalTitle: goalName, GoalText: goalUpdateText, GoalProgress: progress });
+}
 export class SparkleGlobal {
 }
 SparkleGlobal.MY_GOALS_APP_ID = 1;
 SparkleGlobal.MY_HEALTH_APP_ID = 2;
 SparkleGlobal.MY_MOOD_APP_ID = 3;
+export function date(date) {
+  return format(new Date(date), 'DD MMM YYYY');
+}

package/dist/collection/utils.js

@@ -21,7 +21,6 @@ class Utils {
     document.body.appendChild(script);
   }
   loadScriptAsync(src) {
-    debugger;
     return new Promise(function (resolve, reject) {
       const s = document.createElement('script');
       let r = false;

package/dist/esm/{PrivateRoute-ff728f5b.js → PrivateRoute-9f0973bb.js}

@@ -1,5 +1,5 @@
-import { a as getAssetPath, h } from './index-24b18689.js';
-import { c as createStore, H as HttpService } from './httpService-010551aa.js';
+import { a as getAssetPath, h } from './index-55fc9f5e.js';
+import { A as AuthStore, H as HttpService } from './auth.store-dd944bc2.js';
 
 //import * as abpTypings from '../lib/abp';
 class Utils {
@@ -24,7 +24,6 @@ class Utils {
     document.body.appendChild(script);
   }
   loadScriptAsync(src) {
-    debugger;
     return new Promise(function (resolve, reject) {
       const s = document.createElement('script');
       let r = false;
@@ -95,6 +94,7 @@ class Utils {
 }
 const Util = new Utils();
 
+//declare var sparkle: any;
 async function setupConfig(config) {
   if (!window) {
     return;
@@ -107,7 +107,9 @@ async function setupConfig(config) {
   }
   win.Sparkle = win.Sparkle || {};
   win.Sparkle.config = Object.assign(Object.assign({}, win.Sparkle.config), config);
-  sparkle.config = Object.assign({}, config.sparkle);
+  // sparkle.config = {
+  //   ...config.sparkle
+  // };
   return win.Sparkle.config;
 }
 async function initSetupConfig(config) {
@@ -163,17 +165,6 @@ const AppConsts = {
   }
 };
 
-const { state, onChange, reset } = createStore({
-  authUser: null,
-  bearer: 'Bearer ',
-  isAuthenticated: false
-});
-onChange('authUser', (authUser) => {
-  state.bearer = `Bearer ${authUser ? authUser.JWToken : ''}`;
-  state.isAuthenticated = authUser && !!authUser.Id;
-});
-const AuthStore = { state, onChange, reset };
-
 class AuthService {
   constructor() { }
   static getInstance() {
@@ -186,31 +177,40 @@ class AuthService {
     const headers = {
       'Content-Type': 'application/json',
     };
-    let result = await HttpService.http.post('api/Account/Authenticate', authenticationInput, {
-      headers: headers
-    });
-    if (result) {
-      const authData = result.Data;
-      const authUser = {
-        Id: authData.Id,
-        UserName: authData.UserName,
-        Email: authData.Email,
-        Roles: authData.Roles,
-        IsVerified: authData.IsVerified,
-        JWToken: authData.JWToken,
-        IssuedOn: authData.IssuedOn,
-        ExpiresOn: authData.ExpiresOn,
-        RefreshToken: authData.RefreshToken,
-        PhotoUrl: "",
-        IsFacilitator: authData.Roles.indexOf("Facilitator") > 0
-      };
-      const expireDate = authenticationInput.RememberClient ? new Date(authUser.ExpiresOn) : undefined;
-      sparkle.auth.setToken(authUser.JWToken, expireDate);
-      //TODO: change authUser.JWToken to encrypted
-      sparkle.utils.setCookieValue(AppConsts.authorization.encrptedAuthTokenName, authUser.JWToken, expireDate, sparkle.appPath);
-      await set(AppConsts.AUTH_USER_LOCALSTORAGE, authUser);
-      AuthStore.state.authUser = Object.assign({}, authUser);
-      return authUser;
+    AuthStore.state.loading = true;
+    let result;
+    try {
+      result = await HttpService.http.post('api/Account/Authenticate', authenticationInput, {
+        headers: headers
+      });
+      if (result) {
+        const authData = result.Data;
+        const authUser = {
+          Id: authData.Id,
+          UserName: authData.UserName,
+          Email: authData.Email,
+          Roles: authData.Roles,
+          IsVerified: authData.IsVerified,
+          JWToken: authData.JWToken,
+          IssuedOn: authData.IssuedOn,
+          ExpiresOn: authData.ExpiresOn,
+          RefreshToken: authData.RefreshToken,
+          PhotoUrl: "",
+          IsFacilitator: authData.Roles.indexOf("Facilitator") > 0
+        };
+        const expireDate = authenticationInput.RememberClient ? new Date(authUser.ExpiresOn) : undefined;
+        sparkle.auth.setToken(authUser.JWToken, expireDate);
+        //TODO: change authUser.JWToken to encrypted
+        sparkle.utils.setCookieValue(AppConsts.authorization.encrptedAuthTokenName, authUser.JWToken, expireDate, sparkle.appPath);
+        await set(AppConsts.AUTH_USER_LOCALSTORAGE, authUser);
+        AuthStore.state.authUser = Object.assign({}, authUser);
+        AuthStore.state.loading = false;
+        return authUser;
+      }
+    }
+    catch (e) {
+      AuthStore.state.loading = false;
+      return e;
     }
   }
   async signOut() {
@@ -254,4 +254,4 @@ const Route = (_a) => {
 };
 const PrivateRoute = Route;
 
-export { AuthService as A, PrivateRoute as P, AuthStore as a, initSetupConfig as i, setupConfig as s };
+export { AuthService as A, PrivateRoute as P, initSetupConfig as i, setupConfig as s };

package/dist/esm/{active-router-044bf79e.js → active-router-b3ae32c7.js}

@@ -1,4 +1,4 @@
-import { h } from './index-24b18689.js';
+import { h } from './index-55fc9f5e.js';
 
 const createProviderConsumer = (defaultState, consumerRender) => {
     let listeners = new Map();

package/dist/esm/{app-globals-d592451f.js → app-globals-6451faf3.js}

@@ -1,4 +1,4 @@
-import { i as ionicCoreGlobalScript } from './ionic-global-fddd88d0.js';
+import { i as ionicCoreGlobalScript } from './ionic-global-1f9287cc.js';
 
 const globalScripts = () => {
   ionicCoreGlobalScript();

package/dist/esm/{assets.service-da511a45.js → assets.service-66e848b8.js}

@@ -1,28 +1,4 @@
-class EnvironmentConfigService {
-  constructor() {
-    // Private constructor, singleton
-    this.init();
-  }
-  static getInstance() {
-    if (!EnvironmentConfigService.instance) {
-      EnvironmentConfigService.instance = new EnvironmentConfigService();
-    }
-    return EnvironmentConfigService.instance;
-  }
-  init() {
-    if (!window) {
-      return;
-    }
-    const win = window;
-    const Sparkle = win.Sparkle;
-    console.log('getting info');
-    this.m = new Map(Object.entries(Sparkle.config));
-  }
-  get(key, fallback) {
-    const value = this.m.get(key);
-    return value !== undefined ? value : fallback;
-  }
-}
+import { E as EnvironmentConfigService } from './environment-config.service-2b5d692b.js';
 
 class AssetsService {
   constructor() {
@@ -69,4 +45,4 @@ class AssetsService {
   }
 }
 
-export { AssetsService as A, EnvironmentConfigService as E };
+export { AssetsService as A };

package/dist/esm/{httpService-010551aa.js → auth.store-dd944bc2.js}

@@ -1,5 +1,6 @@
-import { c as getRenderingRef, f as forceUpdate } from './index-24b18689.js';
-import { t as toastController } from './overlays-8606ae17.js';
+import { c as getRenderingRef, f as forceUpdate } from './index-55fc9f5e.js';
+import { E as EnvironmentConfigService } from './environment-config.service-2b5d692b.js';
+import { t as toastController } from './overlays-8363621c.js';
 
 var bind = function bind(fn, thisArg) {
   return function wrap() {
@@ -2448,8 +2449,9 @@ class HttpService {
     return HttpService.instance;
   }
   static init() {
+    var sparkleConfig = EnvironmentConfigService.getInstance().get('sparkle');
     this.http = axios$1.create({
-      baseURL: sparkle.config.apiUrl,
+      baseURL: sparkleConfig.apiUrl,
       headers: {
         'Content-Type': 'application/json'
       },
@@ -2461,11 +2463,12 @@ class HttpService {
       },
     });
     this.http.interceptors.request.use(function (config) {
-      if (!!sparkle && !!sparkle.auth.getToken()) {
+      if (!!sparkleConfig && !!sparkleConfig.auth && !!sparkleConfig.auth.getToken()) {
         config.headers.common['Authorization'] = 'Bearer ' + sparkle.auth.getToken();
       }
       // //config.headers.common['.AspNetCore.Culture'] = sparkle.utils.getCookieValue('Sparkle.Localization.CultureName');
-      config.headers.common['Sparkle.CourseId'] = sparkle.config.courseId;
+      config.headers.common['Sparkle.CourseId'] = sparkleConfig.courseId;
+      console.log(TocStore.state.pageInfo);
       if (TocStore.state.pageInfo) {
         config.headers.common['Sparkle.CourseModuleId'] = TocStore.state.pageInfo.courseModuleId;
         config.headers.common['Sparkle.SessionId'] = TocStore.state.pageInfo.sessionId;
@@ -2495,6 +2498,16 @@ class HttpService {
         toast.present();
         return Promise.reject(error);
       }
+      else if (error.response && error.response.data && error.response.status == 400) {
+        // The request was made and the server responded with a status code
+        // that falls out of the range of 2xx
+        const toast = await toastController.create({
+          message: error.response.data.Message,
+          duration: 3000
+        });
+        toast.present();
+        return Promise.reject(error.response.data);
+      }
       else if (error.response && error.response.data && error.response.data.Message) {
         // The request was made and the server responded with a status code
         // that falls out of the range of 2xx
@@ -2524,4 +2537,16 @@ class HttpService {
   }
 }
 
-export { HttpService as H, TocStore as T, createStore as c };
+const { state: state$1, onChange: onChange$1, reset: reset$1 } = createStore({
+  authUser: null,
+  bearer: 'Bearer ',
+  isAuthenticated: false,
+  loading: false
+});
+onChange$1('authUser', (authUser) => {
+  state$1.bearer = `Bearer ${authUser ? authUser.JWToken : ''}`;
+  state$1.isAuthenticated = authUser && !!authUser.Id;
+});
+const AuthStore = { state: state$1, onChange: onChange$1, reset: reset$1 };
+
+export { AuthStore as A, HttpService as H, TocStore as T, createStore as c };

package/dist/esm/{button-active-32a41594.js → button-active-97535443.js}

@@ -1,4 +1,4 @@
-import { w as writeTask } from './index-24b18689.js';
+import { w as writeTask } from './index-55fc9f5e.js';
 import { createGesture } from './index-b2ad0f1a.js';
 import { h as hapticSelectionEnd, a as hapticSelectionStart, b as hapticSelectionChanged } from './haptic-67928174.js';