consolidate interface and remove copies of code

src/App.vue

@@ -288,21 +288,14 @@ interface VapidResponse {
   };
 }
 
-import { DEFAULT_PUSH_SERVER } from "@/constants/app";
+import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { sendTestThroughPushServer } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class App extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   b64 = "";
   serviceWorkerReady = false;

src/components/GiftedDialog.vue

@@ -67,6 +67,8 @@
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
 import {
   createAndSubmitGive,
   didInfo,
@@ -78,16 +80,9 @@ import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop message = "";
   @Prop projectId = "";

src/components/GiftedPrompts.vue

@@ -64,20 +64,13 @@
 <script lang="ts">
 import { Vue, Component } from "vue-facing-decorator";
 
-import { AppString } from "@/constants/app";
+import { AppString, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class GivenPrompts extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   IDEAS = [
     "Did anyone fix food for you?",

src/components/OfferDialog.vue

@@ -68,22 +68,17 @@
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
 import { createAndSubmitOffer } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { Account } from "@/db/tables/accounts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component
 export default class OfferDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop message = "";
   @Prop projectId = "";

src/components/TopMessage.vue

@@ -4,20 +4,14 @@
 
 <script lang="ts">
 import { Component, Vue, Prop } from "vue-facing-decorator";
+
+import { AppString, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { AppString } from "@/constants/app";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component
 export default class TopMessage extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   @Prop selected = "";
 

src/views/AccountViewView.vue

@@ -485,7 +485,11 @@ import { useClipboard } from "@vueuse/core";
 
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
-import { AppString, DEFAULT_PUSH_SERVER } from "@/constants/app";
+import {
+  AppString,
+  DEFAULT_PUSH_SERVER,
+  NotificationIface,
+} from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -495,13 +499,6 @@ import { ErrorResponse, RateLimits } from "@/libs/endorserServer";
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 interface IAccount {
   did: string;
   publicKeyHex: string;
@@ -513,7 +510,7 @@ const inputFileNameRef = ref<Blob>();
 
 @Component({ components: { QuickNav, TopMessage } })
 export default class AccountViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   AppConstants = AppString;
   DEFAULT_PUSH_SERVER = DEFAULT_PUSH_SERVER;

src/views/ClaimView.vue

@@ -407,6 +407,7 @@ import { useClipboard } from "@vueuse/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
@@ -418,18 +419,11 @@ import EntityIcon from "@/components/EntityIcon.vue";
 import { Account } from "@/db/tables/accounts";
 import { GiverInputInfo } from "@/libs/endorserServer";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
 })
 export default class ClaimView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   accountIdentityStr: string = "null";
   activeDid = "";

src/views/ContactAmountsView.vue

@@ -105,9 +105,14 @@
 </template>
 
 <script lang="ts">
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import * as R from "ramda";
-
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
+
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
@@ -118,21 +123,10 @@ import {
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
 } from "@/libs/endorserServer";
-import * as didJwt from "did-jwt";
-import { AxiosError } from "axios";
-import QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({ components: { QuickNav } })
 export default class ContactAmountssView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";

src/views/ContactGiftingView.vue

@@ -76,29 +76,24 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+import { IIdentifier } from "@veramo/core";
+
 import GiftedDialog from "@/components/GiftedDialog.vue";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account, AccountsSchema } from "@/db/tables/accounts";
+import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { GiverInputInfo } from "@/libs/endorserServer";
-import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class ContactGiftingView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];

src/views/ContactQRScanShowView.vue

@@ -78,6 +78,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import { QrcodeStream } from "vue-qrcode-reader";
 import { useClipboard } from "@vueuse/core";
 
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { deriveAddress, nextDerivationPath, SimpleSigner } from "@/libs/crypto";
@@ -91,13 +92,6 @@ import {
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: {
     QrcodeStream,
@@ -106,7 +100,7 @@ interface Notification {
   },
 })
 export default class ContactQRScanShow extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";

src/views/DiscoverView.vue

@@ -129,23 +129,17 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
-import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import { didInfo, PlanData } from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
-
+import { NotificationIface } from "@/constants/app";
-interface Notification {
+import { accountsDB, db } from "@/db/index";
-  group: string;
+import { Contact } from "@/db/tables/contacts";
-  type: string;
+import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-  title: string;
+import { accessToken } from "@/libs/crypto";
-  text: string;
+import { didInfo, PlanData } from "@/libs/endorserServer";
-}
 
 @Component({
   components: {
@@ -157,7 +151,7 @@ interface Notification {
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];

src/views/HelpNotificationsView.vue

@@ -294,18 +294,12 @@
 import { Component, Vue } from "vue-facing-decorator";
 
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { sendTestThroughPushServer } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class HelpNotificationsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   subscription: PushSubscription | null = null;
 

src/views/HelpView.vue

@@ -325,18 +325,12 @@ import { Component, Vue } from "vue-facing-decorator";
 
 import * as Package from "../../package.json";
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { ONBOARD_MESSAGE } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   package = Package;
   commitHash = process.env.VUE_APP_GIT_HASH;

src/views/HomeView.vue

@@ -230,6 +230,7 @@
 
 <script lang="ts">
 import { UAParser } from "ua-parser-js";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 
 import EntityIcon from "@/components/EntityIcon.vue";
@@ -238,6 +239,7 @@ import GiftedPrompts from "@/components/GiftedPrompts.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
@@ -249,16 +251,8 @@ import {
   GiverInputInfo,
   GiveServerRecord,
 } from "@/libs/endorserServer";
-import { IIdentifier } from "@veramo/core";
 import { generateSaveAndActivateIdentity } from "@/libs/util";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 interface GiveRecordWithContactInfo extends GiveServerRecord {
   giver: {
     displayName: string;
@@ -281,7 +275,7 @@ interface GiveRecordWithContactInfo extends GiveServerRecord {
   },
 })
 export default class HomeView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];

src/views/IdentitySwitcherView.vue

@@ -80,22 +80,16 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { AppString } from "@/constants/app";
+
+import { AppString, NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class IdentitySwitcherView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   Constants = AppString;
   public accounts: typeof AccountsSchema;

src/views/ImportAccountView.vue

@@ -75,20 +75,15 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
-} from "../libs/crypto";
+} from "@/libs/crypto";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: {},
@@ -96,7 +91,7 @@ interface Notification {
 export default class ImportAccountView extends Vue {
   UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
 
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   mnemonic = "";
   address = "";

src/views/NewEditProjectView.vue

@@ -138,6 +138,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -145,18 +146,11 @@ import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
 import { PlanVerifiableCredential } from "@/libs/endorserServer";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: { LMap, LMarker, LTileLayer, QuickNav },
 })
 export default class NewEditProjectView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   agentDid = "";

src/views/ProjectViewView.vue

@@ -348,7 +348,12 @@ import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import ProjectIcon from "@/components/ProjectIcon.vue";
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -362,17 +367,6 @@ import {
   PlanServerRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({
   components: {
@@ -385,7 +379,7 @@ interface Notification {
   },
 })
 export default class ProjectViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   agentDid = "";

src/views/ProjectsView.vue

@@ -213,6 +213,7 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
+import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
@@ -225,18 +226,11 @@ import TopMessage from "@/components/TopMessage.vue";
 import { OfferServerRecord, PlanData } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
 })
 export default class ProjectsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   apiServer = "";
   projects: PlanData[] = [];

src/views/SearchAreaView.vue

@@ -105,21 +105,15 @@ import {
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
 
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
 
 const DEFAULT_LAT_LONG_DIFF = 0.01;
 const WORLD_ZOOM = 2;
 const DEFAULT_ZOOM = 2;
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({
   components: {
     QuickNav,
@@ -130,7 +124,7 @@ interface Notification {
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   isChoosingSearchBox = false;
   isNewMarkerSet = false;

src/views/SeedBackupView.vue

@@ -65,25 +65,20 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
 import * as R from "ramda";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 interface Account {
   mnemonic: string;
 }
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { QuickNav } })
 export default class SeedBackupView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;

src/views/StatisticsView.vue

@@ -53,8 +53,10 @@
 <script lang="ts">
 import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
 import { Component, Vue } from "vue-facing-decorator";
+
 import { World } from "@/components/World/World.js";
 import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 
 interface RendererSVGType {
   domElement: Element;
@@ -64,16 +66,9 @@ interface Dictionary<T> {
   [key: string]: T;
 }
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
 @Component({ components: { World, QuickNav } })
 export default class StatisticsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   world: World;
   worldProperties: Dictionary<number> = {};