@churchapps/helpers 1.0.11 → 1.0.12

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2023 Live Church Solutions
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2023 Live Church Solutions
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,15 +1,15 @@
-# Helpers
-
-Library of helper functions not specific to any project or framework.
-
-## To Test
-
-1. After making changes run `npm build` followed by `npm link` to expose the package locally
-2. In your test project run `@npm link @churchapps/helpers`
-3. Rerun both after changes
-
-## To Publish
-
-1. Update version number in package.json
-2. Run `npm run build`
-3. Run `npm publish --access=public`
+# Helpers
+
+Library of helper functions not specific to any project or framework.
+
+## To Test
+
+1. After making changes run `npm build` followed by `npm link` to expose the package locally
+2. In your test project run `@npm link @churchapps/helpers`
+3. Rerun both after changes
+
+## To Publish
+
+1. Update version number in package.json
+2. Run `npm run build`
+3. Run `npm publish --access=public`

package/dist/interfaces/Messaging.d.ts

@@ -3,7 +3,7 @@ export interface ConnectionInterface {
     id?: string;
     churchId?: string;
     conversationId?: string;
-    userId?: string;
+    personId?: string;
     displayName?: string;
     timeJoined?: Date;
     socketId?: string;
@@ -27,7 +27,6 @@ export interface MessageInterface {
     id?: string;
     churchId?: string;
     conversationId?: string;
-    userId?: string;
     personId?: string;
     displayName?: string;
     timeSent?: Date;
@@ -36,6 +35,24 @@ export interface MessageInterface {
     content?: string;
     person?: PersonInterface;
 }
+export interface NotificationInterface {
+    id?: string;
+    churchId?: string;
+    personId?: string;
+    contentType?: string;
+    contentId: string;
+    timeSent?: Date;
+    isNew: boolean;
+    message?: string;
+    deliveryMethod?: string;
+}
+export interface NotificationPreferenceInterface {
+    id?: string;
+    churchId?: string;
+    personId?: string;
+    allowPush: boolean;
+    emailFrequency: string;
+}
 export interface PrivateMessageInterface {
     id?: string;
     churchId?: string;
@@ -45,6 +62,7 @@ export interface PrivateMessageInterface {
     notifyPersonId?: string;
     conversation?: ConversationInterface;
     person?: PersonInterface;
+    deliveryMethod?: string;
 }
 export interface SocketActionHandlerInterface {
     action: string;

package/dist/interfaces/Messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Messaging.d.ts","sourceRoot":"","sources":["../../src/interfaces/Messaging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,MAAM,WAAW,mBAAmB;IAAG,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE;AAC7K,MAAM,WAAW,qBAAqB;IACpC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAClP,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;CAC/B;AACD,MAAM,WAAW,gBAAgB;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,IAAI,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC/L,MAAM,CAAC,EAAE,eAAe,CAAA;CACzB;AACD,MAAM,WAAW,uBAAuB;IACtC,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAC5H,YAAY,CAAC,EAAE,qBAAqB,CAAC;IACrC,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,MAAM,WAAW,4BAA4B;IAAG,MAAM,EAAC,MAAM,CAAC;IAAC,EAAE,EAAC,MAAM,CAAC;IAAC,aAAa,EAAC,CAAC,IAAI,EAAC,GAAG,KAAK,IAAI,CAAA;CAAE;AAC5G,MAAM,MAAM,mBAAmB,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,GAAG,YAAY,GAAG,eAAe,GAAG,UAAU,GAAG,gBAAgB,GAAG,kBAAkB,GAAG,iBAAiB,GAAG,WAAW,CAAC;AAClM,MAAM,WAAW,sBAAsB;IAAI,MAAM,EAAE,mBAAmB,CAAC;IAAC,IAAI,EAAE,GAAG,CAAA;CAAE"}
+{"version":3,"file":"Messaging.d.ts","sourceRoot":"","sources":["../../src/interfaces/Messaging.ts"],"names":[],"mappings":"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"}

package/dist/interfaces/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./Error";
 export * from "./UserContextInterface";
 export * from "./Permissions";
 export * from "./Access";

package/dist/interfaces/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAG9B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAI9B,cAAc,UAAU,CAAC;AACzB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC"}

package/dist/interfaces/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Error"), exports);
 __exportStar(require("./UserContextInterface"), exports);
 __exportStar(require("./Permissions"), exports);
 // API interfaces

package/dist/interfaces/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,gDAA8B;AAE9B,iBAAiB;AACjB,2CAAyB;AACzB,+CAA6B;AAC7B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/interfaces/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,yDAAuC;AACvC,gDAA8B;AAG9B,iBAAiB;AACjB,2CAAyB;AACzB,+CAA6B;AAC7B,4CAA0B;AAC1B,0CAAwB;AACxB,6CAA2B;AAC3B,+CAA6B;AAC7B,8CAA4B;AAC5B,8CAA4B"}

package/package.json

@@ -1,38 +1,38 @@
-{
-  "name": "@churchapps/helpers",
-  "version": "1.0.11",
-  "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
-  "main": "dist/index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "clean": "rimraf dist",
-    "tsc": "tsc",
-    "build": "npm-run-all clean tsc"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/LiveChurchSolutions/Helpers.git"
-  },
-  "keywords": [
-    "ChurchApps"
-  ],
-  "author": "ChurchApps.org",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/LiveChurchSolutions/Helpers/issues"
-  },
-  "homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
-  "devDependencies": {
-    "@types/node": "^20.5.8",
-    "npm-run-all": "^4.1.5",
-    "rimraf": "^5.0.1",
-    "typescript": "^5.2.2"
-  },
-  "dependencies": {
-    "axios": "^1.5.0",
-    "date-fns": "^2.30.0",
-    "dayjs": "^1.11.9",
-    "react-ga4": "^2.1.0",
-    "rrule": "^2.7.2"
-  }
-}
+{
+  "name": "@churchapps/helpers",
+  "version": "1.0.12",
+  "description": "Library of helper functions not specific to any one ChurchApps project or framework.",
+  "main": "dist/index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "clean": "rimraf dist",
+    "tsc": "tsc",
+    "build": "npm-run-all clean tsc"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/LiveChurchSolutions/Helpers.git"
+  },
+  "keywords": [
+    "ChurchApps"
+  ],
+  "author": "ChurchApps.org",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/LiveChurchSolutions/Helpers/issues"
+  },
+  "homepage": "https://github.com/LiveChurchSolutions/Helpers#readme",
+  "devDependencies": {
+    "@types/node": "^20.5.8",
+    "npm-run-all": "^4.1.5",
+    "rimraf": "^5.0.1",
+    "typescript": "^5.2.2"
+  },
+  "dependencies": {
+    "axios": "^1.5.0",
+    "date-fns": "^2.30.0",
+    "dayjs": "^1.11.9",
+    "react-ga4": "^2.1.0",
+    "rrule": "^2.7.2"
+  }
+}

package/src/ApiHelper.ts

@@ -1,132 +1,132 @@
-import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
-import { ErrorHelper } from "./ErrorHelper";
-
-export class ApiHelper {
-
-  static apiConfigs: ApiConfig[] = [];
-  static isAuthenticated = false;
-  static onRequest: (url:string, requestOptions:any) => void;
-  static onError: (url:string, requestOptions:any, error: any) => void;
-
-  static getConfig(keyName: string) {
-    let result: ApiConfig = null;
-    this.apiConfigs.forEach(config => { if (config.keyName === keyName) result = config });
-    //if (result === null) throw new Error("Unconfigured API: " + keyName);
-    return result;
-  }
-
-  static setDefaultPermissions(jwt: string) {
-    this.apiConfigs.forEach(config => {
-      config.jwt = jwt;
-      config.permisssions = [];
-    });
-    this.isAuthenticated = true;
-  }
-
-  static setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
-    this.apiConfigs.forEach(config => {
-      if (config.keyName === keyName) {
-        config.jwt = jwt;
-        config.permisssions = permissions;
-      }
-    });
-    this.isAuthenticated = true;
-  }
-
-  static clearPermissions() {
-    this.apiConfigs.forEach(config => { config.jwt = ""; config.permisssions = []; });
-    this.isAuthenticated = false;
-  }
-
-  static async get(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = { method: "GET", headers: { Authorization: "Bearer " + config.jwt } };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async getAnonymous(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = { method: "GET" };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async post(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = {
-      method: "POST",
-      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async patch(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = {
-      method: "PATCH",
-      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async delete(path: string, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = {
-      method: "DELETE",
-      headers: { Authorization: "Bearer " + config.jwt }
-    };
-    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
-    try {
-      const response = await fetch(config.url + path, requestOptions);
-      if (!response.ok) await this.throwApiError(response);
-    } catch (e) {
-      console.log(e);
-      if (this.onError) this.onError(config.url + path, requestOptions, e);
-      throw (e);
-    }
-  }
-
-  static async postAnonymous(path: string, data: any[] | {}, apiName: ApiListType) {
-    const config = this.getConfig(apiName);
-    const requestOptions = {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify(data)
-    };
-    console.log(config.url + path, requestOptions);
-    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
-  }
-
-  static async fetchWithErrorHandling(url: string, requestOptions: any) {
-    if (this.onRequest) this.onRequest(url, requestOptions);
-    try {
-      const response = await fetch(url, requestOptions);
-      if (!response.ok) await this.throwApiError(response);
-      else {
-        if (response.status !== 204 ) {
-          return response.json();
-        }
-      }
-    } catch (e) {
-      console.log("Error loading url: " + url);
-      console.log(e)
-      throw (e);
-    }
-  }
-
-  private static async throwApiError(response: Response) {
-    let msg = response.statusText;
-    try {
-      msg = await response.text();
-    } catch {}
-    try {
-      const json = await response.json();
-      msg = json.errors[0];
-    } catch { }
-    console.log("RESPONSE", response)
-    ErrorHelper.logError(response.status.toString(), response.url, msg);
-    throw new Error(msg || "Error");
-  }
-
-}
+import { ApiConfig, RolePermissionInterface, ApiListType } from "./interfaces";
+import { ErrorHelper } from "./ErrorHelper";
+
+export class ApiHelper {
+
+  static apiConfigs: ApiConfig[] = [];
+  static isAuthenticated = false;
+  static onRequest: (url:string, requestOptions:any) => void;
+  static onError: (url:string, requestOptions:any, error: any) => void;
+
+  static getConfig(keyName: string) {
+    let result: ApiConfig = null;
+    this.apiConfigs.forEach(config => { if (config.keyName === keyName) result = config });
+    //if (result === null) throw new Error("Unconfigured API: " + keyName);
+    return result;
+  }
+
+  static setDefaultPermissions(jwt: string) {
+    this.apiConfigs.forEach(config => {
+      config.jwt = jwt;
+      config.permisssions = [];
+    });
+    this.isAuthenticated = true;
+  }
+
+  static setPermissions(keyName: string, jwt: string, permissions: RolePermissionInterface[]) {
+    this.apiConfigs.forEach(config => {
+      if (config.keyName === keyName) {
+        config.jwt = jwt;
+        config.permisssions = permissions;
+      }
+    });
+    this.isAuthenticated = true;
+  }
+
+  static clearPermissions() {
+    this.apiConfigs.forEach(config => { config.jwt = ""; config.permisssions = []; });
+    this.isAuthenticated = false;
+  }
+
+  static async get(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = { method: "GET", headers: { Authorization: "Bearer " + config.jwt } };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async getAnonymous(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = { method: "GET" };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async post(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = {
+      method: "POST",
+      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async patch(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = {
+      method: "PATCH",
+      headers: { Authorization: "Bearer " + config.jwt, "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async delete(path: string, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = {
+      method: "DELETE",
+      headers: { Authorization: "Bearer " + config.jwt }
+    };
+    if (this.onRequest) this.onRequest(config.url + path, requestOptions);
+    try {
+      const response = await fetch(config.url + path, requestOptions);
+      if (!response.ok) await this.throwApiError(response);
+    } catch (e) {
+      console.log(e);
+      if (this.onError) this.onError(config.url + path, requestOptions, e);
+      throw (e);
+    }
+  }
+
+  static async postAnonymous(path: string, data: any[] | {}, apiName: ApiListType) {
+    const config = this.getConfig(apiName);
+    const requestOptions = {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify(data)
+    };
+    console.log(config.url + path, requestOptions);
+    return await this.fetchWithErrorHandling(config.url + path, requestOptions);
+  }
+
+  static async fetchWithErrorHandling(url: string, requestOptions: any) {
+    if (this.onRequest) this.onRequest(url, requestOptions);
+    try {
+      const response = await fetch(url, requestOptions);
+      if (!response.ok) await this.throwApiError(response);
+      else {
+        if (response.status !== 204 ) {
+          return response.json();
+        }
+      }
+    } catch (e) {
+      console.log("Error loading url: " + url);
+      console.log(e)
+      throw (e);
+    }
+  }
+
+  private static async throwApiError(response: Response) {
+    let msg = response.statusText;
+    try {
+      msg = await response.text();
+    } catch {}
+    try {
+      const json = await response.json();
+      msg = json.errors[0];
+    } catch { }
+    console.log("RESPONSE", response)
+    ErrorHelper.logError(response.status.toString(), response.url, msg);
+    throw new Error(msg || "Error");
+  }
+
+}

package/src/AppearanceHelper.ts

@@ -1,69 +1,69 @@
-
-export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
-
-export class AppearanceHelper {
-
-  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
-  }
-
-  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
-    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
-  }
-
-  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
-    if (size === "400") {
-      return appearanceSettings?.favicon_400x400;
-    }
-
-    if (size === "16") {
-      return appearanceSettings?.favicon_16x16;
-    }
-
-    return null;
-  }
-
-  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
-    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
-    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
-    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
-  }
-
-  private static isDark(backgroundColor: string) {
-    let valid = false;
-    let r = 0;
-    let g = 0;
-    let b = 0;
-
-    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 2));
-      g = this.getHexValue(backgroundColor.substring(3, 4));
-      b = this.getHexValue(backgroundColor.substring(5, 6));
-      valid = true;
-    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
-      r = this.getHexValue(backgroundColor.substring(1, 1));
-      g = this.getHexValue(backgroundColor.substring(2, 2));
-      b = this.getHexValue(backgroundColor.substring(3, 3));
-      valid = true;
-    }
-
-    if (!valid) return false;
-    else {
-      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
-      const rWeight = .299 * Math.pow(r, 2);
-      const gWeight = .587 * Math.pow(g, 2);
-      const bWeight = .114 * Math.pow(b, 2);
-      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
-      //return brightness < 128;  //
-      return brightness < 156;
-    }
-
-  }
-
-  private static getHexValue(hex: string) {
-    let result = parseInt(hex, 16);
-    if (hex.length === 1) result = result * 16;
-    return result;
-  }
-
-}
+
+export interface AppearanceInterface { primaryColor?: string, primaryContrast?: string, secondaryColor?: string, secondaryContrast?: string, logoLight?: string, logoDark?: string, favicon_400x400?: string, favicon_16x16?: string }
+
+export class AppearanceHelper {
+
+  public static getLogoDark(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoDark) ? appearanceSettings.logoDark : defaultLogo;
+  }
+
+  public static getLogoLight(appearanceSettings: AppearanceInterface, defaultLogo: string) {
+    return (appearanceSettings?.logoLight) ? appearanceSettings.logoLight : defaultLogo;
+  }
+
+  public static getFavicon(appearanceSettings: AppearanceInterface, size: "400" | "16") {
+    if (size === "400") {
+      return appearanceSettings?.favicon_400x400;
+    }
+
+    if (size === "16") {
+      return appearanceSettings?.favicon_16x16;
+    }
+
+    return null;
+  }
+
+  public static getLogo(appearanceSettings: AppearanceInterface, defaultLogoLight: string, defaultLogoDark: string, backgroundColor: string) {
+    const isDark = (appearanceSettings.logoDark) ? this.isDark(backgroundColor) : false;
+    if (isDark) return this.getLogoDark(appearanceSettings, defaultLogoDark);
+    else return this.getLogoLight(appearanceSettings, defaultLogoLight);
+  }
+
+  private static isDark(backgroundColor: string) {
+    let valid = false;
+    let r = 0;
+    let g = 0;
+    let b = 0;
+
+    if (backgroundColor.match(/#[0-9a-fA-F{6}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 2));
+      g = this.getHexValue(backgroundColor.substring(3, 4));
+      b = this.getHexValue(backgroundColor.substring(5, 6));
+      valid = true;
+    } else if (backgroundColor.match(/#[0-9a-fA-F{3}]/)) {
+      r = this.getHexValue(backgroundColor.substring(1, 1));
+      g = this.getHexValue(backgroundColor.substring(2, 2));
+      b = this.getHexValue(backgroundColor.substring(3, 3));
+      valid = true;
+    }
+
+    if (!valid) return false;
+    else {
+      //HSP brightness formula.  Some colors have a bigger impact on our perceived brightness than others.
+      const rWeight = .299 * Math.pow(r, 2);
+      const gWeight = .587 * Math.pow(g, 2);
+      const bWeight = .114 * Math.pow(b, 2);
+      const brightness = Math.sqrt(rWeight + gWeight + bWeight);
+      //return brightness < 128;  //
+      return brightness < 156;
+    }
+
+  }
+
+  private static getHexValue(hex: string) {
+    let result = parseInt(hex, 16);
+    if (hex.length === 1) result = result * 16;
+    return result;
+  }
+
+}