From dbd08f2eb369b97844377bb3a17fccf8348824c1 Mon Sep 17 00:00:00 2001
From: vishnuraghavb <design@vishnuraghav.com>
Date: Tue, 25 May 2021 20:02:53 +0530
Subject: [PATCH] implementing foreground service

---
 app/ForegroundService.js                      |   51 +
 app/components/CookingTimer.vue               |   97 +-
 app/components/EditRecipe.vue                 |   57 +-
 app/components/EnRecipes.vue                  |   28 +-
 app/components/GroceryList.vue                |    5 +-
 app/components/MealPlanner.vue                |   33 +-
 app/components/Settings.vue                   |  106 -
 app/components/Settings/CTSettings.vue        |  139 -
 app/components/Settings/MPSettings.vue        |   75 -
 app/components/Settings/Options.vue           |  109 -
 app/components/ViewRecipe.vue                 |   28 +-
 .../ActionDialog.vue => modals/Action.vue}    |    4 +-
 .../ActionWithSearch.vue}                     |    0
 .../ConfirmDialog.vue => modals/Confirm.vue}  |    0
 .../{modal/Filters.vue => modals/Filter.vue}  |    0
 .../PromptDialog.vue => modals/Prompt.vue}    |    0
 .../TimePickerHM.vue}                         |    0
 .../TimePickerHMS.vue}                        |    0
 .../{Settings => settings}/About.vue          |   11 +-
 app/components/settings/AppSettings.vue       |   82 +
 app/components/settings/CTSettings.vue        |  134 +
 .../{Settings => settings}/Database.vue       |   70 +-
 .../{Settings => settings}/Interface.vue      |   56 +-
 app/components/settings/MPSettings.vue        |   45 +
 app/components/settings/Options.vue           |   69 +
 .../{Settings => settings}/Reset.vue          |   74 +-
 app/components/sub/OptionsList.vue            |   62 +
 app/components/sub/SnackBar.vue               |   23 +
 .../{SingleTimer.vue => sub/Timer.vue}        |    6 +-
 app/components/sub/Toast.vue                  |   20 +
 app/i18n/en-GB.default.json                   |    3 +-
 app/main.ts                                   |   24 +-
 .../Android/src/main/AndroidManifest.xml      |   10 +-
 .../src/main/res/values-ar/strings.xml        |    2 +
 .../src/main/res/values-ca/strings.xml        |    4 +-
 .../src/main/res/values-da/strings.xml        |    2 +
 .../src/main/res/values-de/strings.xml        |    2 +
 .../src/main/res/values-en-rIN/strings.xml    |    2 +
 .../src/main/res/values-en-rUS/strings.xml    |    2 +
 .../src/main/res/values-es-rAR/strings.xml    |    4 +-
 .../src/main/res/values-es/strings.xml        |    2 +
 .../src/main/res/values-fi/strings.xml        |    4 +-
 .../src/main/res/values-fr-rBE/strings.xml    |    2 +
 .../src/main/res/values-fr-rCA/strings.xml    |    2 +
 .../src/main/res/values-fr-rCH/strings.xml    |    2 +
 .../src/main/res/values-fr/strings.xml        |    2 +
 .../src/main/res/values-hi/strings.xml        |    2 +
 .../src/main/res/values-id/strings.xml        |    2 +
 .../src/main/res/values-it/strings.xml        |    2 +
 .../src/main/res/values-ja/strings.xml        |    4 +-
 .../src/main/res/values-kn/strings.xml        |    4 +-
 .../src/main/res/values-ml/strings.xml        |    4 +-
 .../src/main/res/values-nb-rNO/strings.xml    |    4 +-
 .../src/main/res/values-nl/strings.xml        |    2 +
 .../src/main/res/values-pt-rBR/strings.xml    |    2 +
 .../src/main/res/values-pt/strings.xml        |    2 +
 .../src/main/res/values-ru/strings.xml        |    2 +
 .../src/main/res/values-ta/strings.xml        |    4 +-
 .../src/main/res/values-te/strings.xml        |    4 +-
 .../Android/src/main/res/values/strings.xml   |    4 +-
 app/shared/{mixins.js => mixins.ts}           |    2 +
 app/shared/{utils.js => utils.ts}             |  107 +-
 app/store.ts                                  |    7 +-
 package-lock.json                             | 2253 ++++-------------
 tsconfig.json                                 |    2 +-
 webpack.config.js                             |   14 +
 66 files changed, 1391 insertions(+), 2489 deletions(-)
 create mode 100644 app/ForegroundService.js
 delete mode 100644 app/components/Settings.vue
 delete mode 100644 app/components/Settings/CTSettings.vue
 delete mode 100644 app/components/Settings/MPSettings.vue
 delete mode 100644 app/components/Settings/Options.vue
 rename app/components/{modal/ActionDialog.vue => modals/Action.vue} (97%)
 rename app/components/{modal/ActionDialogWithSearch.vue => modals/ActionWithSearch.vue} (100%)
 rename app/components/{modal/ConfirmDialog.vue => modals/Confirm.vue} (100%)
 rename app/components/{modal/Filters.vue => modals/Filter.vue} (100%)
 rename app/components/{modal/PromptDialog.vue => modals/Prompt.vue} (100%)
 rename app/components/{modal/TimePicker.vue => modals/TimePickerHM.vue} (100%)
 rename app/components/{modal/CookingTimePicker.vue => modals/TimePickerHMS.vue} (100%)
 rename app/components/{Settings => settings}/About.vue (92%)
 create mode 100644 app/components/settings/AppSettings.vue
 create mode 100644 app/components/settings/CTSettings.vue
 rename app/components/{Settings => settings}/Database.vue (87%)
 rename app/components/{Settings => settings}/Interface.vue (71%)
 create mode 100644 app/components/settings/MPSettings.vue
 create mode 100644 app/components/settings/Options.vue
 rename app/components/{Settings => settings}/Reset.vue (54%)
 create mode 100644 app/components/sub/OptionsList.vue
 create mode 100644 app/components/sub/SnackBar.vue
 rename app/components/{SingleTimer.vue => sub/Timer.vue} (96%)
 create mode 100644 app/components/sub/Toast.vue
 rename app/shared/{mixins.js => mixins.ts} (96%)
 rename app/shared/{utils.js => utils.ts} (86%)

diff --git a/app/ForegroundService.js b/app/ForegroundService.js
new file mode 100644
index 00000000..dad1177b
--- /dev/null
+++ b/app/ForegroundService.js
@@ -0,0 +1,51 @@
+var ForegroundService = /** @class */ (function(_super) {
+  __extends(ForegroundService, _super)
+  function ForegroundService() {
+    return (_super !== null && _super.apply(this, arguments)) || this
+  }
+  ForegroundService.prototype.onStartCommand = function(
+    intent,
+    flags,
+    startId
+  ) {
+    console.log('onStartCommand')
+    _super.prototype.onStartCommand.call(this, intent, flags, startId)
+    return android.app.Service.START_STICKY
+  }
+  ForegroundService.prototype.onCreate = function() {
+    console.log('onCreate')
+    _super.prototype.onCreate.call(this)
+    this.startForeground(1, this.getNotification())
+  }
+  ForegroundService.prototype.onBind = function(intent) {
+    return _super.prototype.onBind.call(this, intent)
+  }
+  ForegroundService.prototype.onUnbind = function(intent) {
+    return _super.prototype.onUnbind.call(this, intent)
+  }
+  ForegroundService.prototype.onDestroy = function() {
+    console.log('onDestroy')
+    this.stopForeground(true)
+  }
+  ForegroundService.prototype.getNotification = function() {
+    var channel = new android.app.NotificationChannel(
+      'channel_01',
+      'ForegroundService Channel',
+      android.app.NotificationManager.IMPORTANCE_DEFAULT
+    )
+    var notificationManager = this.getSystemService(
+      android.content.Context.NOTIFICATION_SERVICE
+    )
+    notificationManager.createNotificationChannel(channel)
+    var builder = new android.app.Notification.Builder(
+      this.getApplicationContext(),
+      'channel_01'
+    )
+    return builder.build()
+  }
+  ForegroundService = __decorate(
+    [JavaProxy('com.tns.ForegroundService')],
+    ForegroundService
+  )
+  return ForegroundService
+})(android.app.Service)
diff --git a/app/components/CookingTimer.vue b/app/components/CookingTimer.vue
index af2d1054..c7367ff3 100644
--- a/app/components/CookingTimer.vue
+++ b/app/components/CookingTimer.vue
@@ -16,7 +16,7 @@
               @tap="$navigateTo(CTSettings)"
             />
           </GridLayout>
-          <SingleTimer
+          <Timer
             v-for="(timer, i) in activeTimers"
             :key="timer.id"
             ref="singleTimer"
@@ -41,22 +41,19 @@
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
         <Button class="ico fab" :text="icon.plus" @tap="addTimer" col="2" />
       </GridLayout>
-      <GridLayout
-        row="1"
-        class="appbar snackBar"
-        :hidden="!showUndo"
-        columns="auto, *, auto"
-        @swipe="hideUndoBar"
-      >
-        <Button :text="countdown" class="ico countdown tb" />
-        <Label class="title" col="1" :text="snackMsg | L" />
-        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+      <SnackBar
+        :hidden="!showUndo || toast"
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideBar"
+      />
+      <Toast :toast="toast" :action="hideBar" />
     </GridLayout>
   </Page>
 </template>
 
-<script>
+<script lang="ts">
 import { localize } from "@nativescript/localize";
 import {
   Observable,
@@ -64,20 +61,25 @@ import {
   Application,
   ApplicationSettings,
   AndroidApplication,
+  Utils,
 } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
-import CTSettings from "./Settings/CTSettings.vue";
-import ActionDialog from "./modal/ActionDialog.vue";
-import CookingTimePicker from "./modal/CookingTimePicker.vue";
-import CookingTimer from "./CookingTimer.vue";
-import SingleTimer from "./SingleTimer.vue";
-import * as utils from "~/shared/utils";
 
+import Action from "./modals/Action.vue";
+import CookingTimer from "./CookingTimer.vue";
+import CTSettings from "./settings/CTSettings.vue";
+import TimePickerHMS from "./modals/TimePickerHMS.vue";
+import Timer from "./sub/Timer.vue";
+import Toast from "./sub/Toast.vue";
+import SnackBar from "./sub/SnackBar.vue";
+
+import * as utils from "~/shared/utils";
+// import { fgs } from "~/foreground.android";
 import { EventBus } from "~/main";
 let undoTimer;
 
 export default {
-  components: { SingleTimer },
+  components: { Timer, Toast, SnackBar },
   props: ["recipeID"],
   data() {
     return {
@@ -88,6 +90,7 @@ export default {
       showUndo: false,
       undo: false,
       CTSettings: CTSettings,
+      toast: null,
     };
   },
   computed: {
@@ -111,9 +114,8 @@ export default {
       "addTimerPreset",
       "updateActiveTimer",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("CookingTimer");
     },
     onAppBarLoad({ object }) {
@@ -170,17 +172,17 @@ export default {
       let pausedCount = this.activeTimers.filter((e) => e.isPaused).length;
       let ongoingCount = activeCount - pausedCount;
       console.log("notifying");
-      utils.TimerNotification.show({
+      utils.TimerNotif.show({
         bID: "bringToFront",
-        cID: "CookingTimer",
-        cName: "Cooking Timer",
+        cID: "cti",
+        cName: "Cooking Timer info",
         description: `${ongoingCount} ongoing, ${pausedCount} paused`,
         nID: 999,
-        priority: 0,
+        priority: -2,
         sound: null,
         title: localize("timer"),
       });
-      if (activeCount <= 0) utils.TimerNotification.clear(999);
+      if (activeCount <= 0) utils.TimerNotif.clear(999);
     },
     intentListener({ intent, android }) {
       let ct = "CookingTimer";
@@ -191,10 +193,11 @@ export default {
         let openTimer = setInterval(() => {
           if (comp == ct) clearInterval(openTimer);
           else {
-            this.$navigateTo(CookingTimer);
+            if (comp == "CTSettings") this.$navigateBack();
+            else this.$navigateTo(CookingTimer);
             comp = ct;
           }
-          // Application.off(Application.launchEvent, this.intentListener);
+          Application.off(Application.launchEvent, this.intentListener);
           Application.android.off(
             AndroidApplication.activityNewIntentEvent,
             this.intentListener
@@ -210,11 +213,11 @@ export default {
       let title = timer.label;
       let time = this.formattedTime(timer.time);
       let bID = "timer" + timer.id;
-      utils.TimerNotification.show({
+      utils.TimerNotif.show({
         actions: true,
         bID,
-        cID: "FiringTimers",
-        cName: "Firing timers",
+        cID: "cta",
+        cName: "Cooking Timer alerts",
         description: time,
         nID: timer.id,
         priority: 1,
@@ -228,10 +231,18 @@ export default {
         EventBus.$emit(bID, action);
       });
     },
+    startForegroundService() {
+      const ctx = Utils.ad.getApplicationContext();
+      const intent = new android.content.Intent();
+      intent.setClassName(ctx, "com.tns.ForegroundService");
+      ctx.startService(intent);
+    },
 
     // DATA HANDLERS
     addTimer() {
-      this.$showModal(CookingTimePicker, {
+      // fgs.class
+      this.startForegroundService();
+      this.$showModal(TimePickerHMS, {
         props: {
           title: "ntmr",
           label: `${localize("tmr", this.activeTimers.length + 1)}`,
@@ -244,7 +255,7 @@ export default {
             let list = this.timerPresets.map(
               (e) => `${e.label} - ${this.formattedTime(e.time)}`
             );
-            this.$showModal(ActionDialog, {
+            this.$showModal(Action, {
               props: {
                 title: "tmrPrsts",
                 list,
@@ -285,7 +296,7 @@ export default {
     removeTimer(id, index, noUndo) {
       let temp = this.activeTimers[index];
       this.removeActiveTimer(index);
-      utils.TimerNotification.clear(id);
+      utils.TimerNotif.clear(id);
       if (!noUndo) {
         this.showUndoBar("tmrClr")
           .then(() => {
@@ -306,6 +317,7 @@ export default {
       timer.recipeID = timer.timerInterval = null;
       timer.preset = 1;
       this.addTimerPreset(timer);
+      this.showToast("aTPrst");
     },
     togglePause(timer, bool) {
       if (typeof bool === "boolean") timer.isPaused = bool;
@@ -313,6 +325,12 @@ export default {
       this.updateActiveTimer(timer);
       this.notifyTimers();
     },
+    showToast(data) {
+      this.toast = localize(data);
+      utils.timer(5, (val) => {
+        if (!val) this.toast = val;
+      });
+    },
     showUndoBar(message) {
       return new Promise((resolve, reject) => {
         clearTimeout(undoTimer);
@@ -335,7 +353,8 @@ export default {
         }, 100);
       });
     },
-    hideUndoBar({ object }) {
+    hideBar({ object }) {
+      this.appbar.translateY = 64;
       object
         .animate({
           opacity: 0,
@@ -345,7 +364,7 @@ export default {
         })
         .then(() => {
           this.showUndo = false;
-          this.appbar.translateY = 64;
+          this.toast = null;
           this.appbar.animate({
             translate: { x: 0, y: 0 },
             duration: 250,
@@ -366,7 +385,7 @@ export default {
     },
   },
   created() {
-    // Application.on(Application.launchEvent, this.intentListener);
+    Application.on(Application.launchEvent, this.intentListener);
     Application.android.on(
       AndroidApplication.activityNewIntentEvent,
       this.intentListener
diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue
index c6512332..516b4c76 100644
--- a/app/components/EditRecipe.vue
+++ b/app/components/EditRecipe.vue
@@ -267,7 +267,15 @@
         />
         <ActivityIndicator col="2" v-if="saving" :busy="saving" />
       </GridLayout>
-      <GridLayout
+      <SnackBar
+        :hidden="!showUndo"
+        colSpan="2"
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideUndoBar"
+      />
+      <!-- <GridLayout
         row="1"
         class="appbar snackBar"
         :hidden="!showUndo"
@@ -278,7 +286,7 @@
         <Button :text="countdown" class="ico countdown tb" />
         <Label class="title" col="1" :text="snackMsg | L" />
         <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+      </GridLayout> -->
     </GridLayout>
   </Page>
 </template>
@@ -300,14 +308,18 @@ import {
 import { localize } from "@nativescript/localize";
 import { ImageCropper } from "nativescript-imagecropper";
 import { mapState, mapActions } from "vuex";
-import ActionDialog from "./modal/ActionDialog.vue";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
-import PromptDialog from "./modal/PromptDialog.vue";
-import TimePicker from "./modal/TimePicker.vue";
+import Action from "./modals/Action";
+import ActionWithSearch from "./modals/ActionWithSearch";
+import Confirm from "./modals/Confirm";
+import Prompt from "./modals/Prompt";
+import TimePickerHM from "./modals/TimePickerHM";
 import * as utils from "~/shared/utils";
+import SnackBar from "./sub/SnackBar";
 let undoTimer;
 export default {
+  components: {
+    SnackBar,
+  },
   props: [
     "recipeID",
     "filterFavourites",
@@ -384,9 +396,8 @@ export default {
       "addListItemAction",
       "unSyncCombinationsAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.hijackBackEvent();
     },
     onPageUnload() {
@@ -424,7 +435,7 @@ export default {
       this.clearEmptyFields(true);
       if (this.recipe.image) {
         this.modalOpen = true;
-        this.$showModal(ActionDialog, {
+        this.$showModal(Action, {
           props: {
             title: "recPic",
             list: ["aap", "rp"],
@@ -488,7 +499,7 @@ export default {
     // DATA LIST
     showCuisine(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "cui",
           list: this.cuisines,
@@ -496,7 +507,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "newCui",
               action: "aBtn",
@@ -526,7 +537,7 @@ export default {
     },
     showCategories(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "cat",
           list: this.categories,
@@ -534,7 +545,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "nwCat",
               action: "aBtn",
@@ -564,7 +575,7 @@ export default {
     },
     showYieldUnits(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "yieldU",
           list: this.yieldUnits,
@@ -572,7 +583,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "nwYiU",
               action: "aBtn",
@@ -602,7 +613,7 @@ export default {
     },
     showDifficultyLevel(focus) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Difficulty level",
           list: this.difficultyLevels,
@@ -620,7 +631,7 @@ export default {
     },
     showUnits(e, focus, index) {
       this.modalOpen = true;
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Unit",
           list: this.units,
@@ -628,7 +639,7 @@ export default {
         },
       }).then((action) => {
         if (action == "aNBtn") {
-          this.$showModal(PromptDialog, {
+          this.$showModal(Prompt, {
             props: {
               title: "newUnit",
               action: "aBtn",
@@ -662,7 +673,7 @@ export default {
       let filteredRecipes = this.recipes.filter(
         (e) => !existingCombinations.includes(e.id)
       );
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
@@ -923,7 +934,7 @@ export default {
       let t = this.recipe[time].split(":");
       let hr = t[0];
       let min = t[1];
-      this.$showModal(TimePicker, {
+      this.$showModal(TimePickerHM, {
         props: {
           title: `${time == "prepTime" ? "prepT" : "cookT"}`,
           action: "SET",
@@ -975,7 +986,7 @@ export default {
     navigateBack() {
       if (this.hasChanges) {
         this.modalOpen = true;
-        this.$showModal(ConfirmDialog, {
+        this.$showModal(Confirm, {
           props: {
             title: "unsaved",
             description: localize("disc"),
diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue
index 795e85e6..780248a0 100644
--- a/app/components/EnRecipes.vue
+++ b/app/components/EnRecipes.vue
@@ -18,7 +18,7 @@
                 col="1"
                 class="ico"
                 :text="icon.cog"
-                @tap="navigateTo(Settings, 'Settings', true)"
+                @tap="navigateTo(AppSettings, 'Settings', true)"
               />
             </GridLayout>
           </v-template>
@@ -432,10 +432,10 @@ import EditRecipe from "./EditRecipe";
 import MealPlanner from "./MealPlanner";
 import CookingTimer from "./CookingTimer";
 import GroceryList from "./GroceryList";
-import Settings from "./Settings";
-import ActionDialog from "./modal/ActionDialog.vue";
-import ConfirmDialog from "./modal/ConfirmDialog.vue";
-import Filters from "./modal/Filters.vue";
+import AppSettings from "./settings/AppSettings";
+import Action from "./modals/Action";
+import Confirm from "./modals/Confirm";
+import Filters from "./modals/Filter";
 import * as utils from "~/shared/utils";
 let lastTime = 0;
 let lastShake = 0;
@@ -456,7 +456,7 @@ export default {
       scrollPos: 1,
       filterFavourites: false,
       filterTrylater: false,
-      Settings: Settings,
+      AppSettings: AppSettings,
       MealPlanner: MealPlanner,
       CookingTimer: CookingTimer,
       GroceryList: GroceryList,
@@ -603,9 +603,8 @@ export default {
             : View.SYSTEM_UI_FLAG_DARK_STATUS_BAR
         );
     },
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.filterFavourites
         ? this.setComponent("favourites")
         : this.filterTrylater
@@ -685,7 +684,7 @@ export default {
     openSort() {
       this.showTools = false;
       this.releaseBackEvent();
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "srt",
           list: [
@@ -748,7 +747,7 @@ export default {
               this.recipes.findIndex((e) => e.id === this.selection[0])
             ].title
           }"`;
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: localize("conf"),
           description: `${localize(
@@ -1080,7 +1079,12 @@ export default {
     if (!this.recipes.length) this.initRecipes();
     this.initMealPlans();
     this.initListItems();
-    if (!this.timerSound.title) this.setTimerSound(utils.getTones()[0]);
+    if (!this.timerSound.title) {
+      let hasTimerSound = ApplicationSettings.getString("timerSound", 0);
+      this.setTimerSound(
+        hasTimerSound ? JSON.parse(hasTimerSound) : utils.getTones().defaultTone
+      );
+    }
   },
 };
 </script>
diff --git a/app/components/GroceryList.vue b/app/components/GroceryList.vue
index 1ca66b4e..83dab81f 100644
--- a/app/components/GroceryList.vue
+++ b/app/components/GroceryList.vue
@@ -28,9 +28,8 @@ export default {
   },
   methods: {
     ...mapActions(["setComponent"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("GroceryList");
     },
     // HELPERS
diff --git a/app/components/MealPlanner.vue b/app/components/MealPlanner.vue
index 1a4d2aa5..fc79faab 100644
--- a/app/components/MealPlanner.vue
+++ b/app/components/MealPlanner.vue
@@ -120,17 +120,13 @@
           col="3"
         />
       </GridLayout>
-      <GridLayout
-        row="1"
-        class="appbar snackBar"
+      <SnackBar
         :hidden="!showUndo"
-        columns="auto, *, auto"
-        @swipe="hideUndoBar"
-      >
-        <Button :text="countdown" class="ico countdown tb" />
-        <Label class="title" col="1" :text="snackMsg | L" />
-        <Button class="ico fab" :text="icon.undo" @tap="undoDel" col="3" />
-      </GridLayout>
+        :count="countdown"
+        :msg="snackMsg"
+        :undo="undoDel"
+        :action="hideUndoBar"
+      />
     </GridLayout>
   </Page>
 </template>
@@ -138,12 +134,16 @@
 <script>
 import { Observable, CoreTypes } from "@nativescript/core";
 import { mapState, mapActions } from "vuex";
-import ViewRecipe from "./ViewRecipe.vue";
-import MPSettings from "./Settings/MPSettings.vue";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
+import ViewRecipe from "./ViewRecipe";
+import MPSettings from "./settings/MPSettings";
+import ActionWithSearch from "./modals/ActionWithSearch";
+import SnackBar from "./sub/SnackBar";
 let undoTimer;
 
 export default {
+  components: {
+    SnackBar,
+  },
   data() {
     return {
       mealTimes: ["breakfast", "lunch", "dinner", "snacks"],
@@ -227,9 +227,8 @@ export default {
       "addMealPlanAction",
       "deleteMealPlanAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.setComponent("MealPlanner");
       if (!this.today || this.today === new Date().getDate()) this.goToToday();
     },
@@ -342,7 +341,7 @@ export default {
       let filteredRecipes = this.recipes.filter((e) =>
         this.getRecipes[type] ? !this.getRecipes[type].includes(e.id) : true
       );
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: filteredRecipes,
diff --git a/app/components/Settings.vue b/app/components/Settings.vue
deleted file mode 100644
index ce61445d..00000000
--- a/app/components/Settings.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="$index == 6">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.view)"
-          >
-            <Label
-              verticalAlignment="center"
-              class="ico"
-              :text="icon[item.icon]"
-            />
-            <Label verticalAlignment="center" col="1" :text="item.title | L" />
-          </GridLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import Interface from "./Settings/Interface.vue";
-import Options from "./Settings/Options.vue";
-import Database from "./Settings/Database.vue";
-import Reset from "./Settings/Reset.vue";
-import About from "./Settings/About.vue";
-export default {
-  data() {
-    return {
-      items: [
-        {},
-        {
-          icon: "interface",
-          title: "intf",
-          view: Interface,
-        },
-        {
-          icon: "opts",
-          title: "opts",
-          view: Options,
-        },
-        {
-          icon: "db",
-          title: "db",
-          view: Database,
-        },
-        {
-          icon: "reset",
-          title: "rest",
-          view: Reset,
-        },
-        {
-          icon: "info",
-          title: "About",
-          view: About,
-        },
-        {},
-      ],
-    };
-  },
-  computed: {
-    ...mapState(["icon"]),
-  },
-  methods: {
-    ...mapActions(["setComponent"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-      this.setComponent("Settings");
-    },
-    // HELPERS
-    navigateTo(view) {
-      this.$navigateTo(view, {
-        transition: {
-          name: "slide",
-          duration: 200,
-          curve: "easeOut",
-        },
-      });
-    },
-    touch({ object, action }, view) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") this.navigateTo(view);
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/CTSettings.vue b/app/components/Settings/CTSettings.vue
deleted file mode 100644
index 0a78eb33..00000000
--- a/app/components/Settings/CTSettings.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template if="item.type == 'list'">
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1">
-              <Label :text="item.title | L" class="info" />
-              <Label :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable, Device } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import { localize } from "@nativescript/localize";
-import ActionDialog from "../modal/ActionDialog.vue";
-import * as utils from "~/shared/utils";
-
-export default {
-  computed: {
-    ...mapState(["icon", "timerDelay", "timerSound", "timerVibrate"]),
-    items() {
-      return [
-        {},
-        {
-          type: "list",
-          icon: "delay",
-          title: "dlyDur",
-          subTitle: this.timerDelay,
-          action: this.showDelayList,
-        },
-        {
-          type: "list",
-          icon: "sound",
-          title: "tmrSnd",
-          subTitle: this.timerSound.title,
-          action: this.showSoundsList,
-        },
-        {
-          type: "switch",
-          icon: "vibrate",
-          title: "tmrvbrt",
-          checked: this.timerVibrate,
-          action: this.toggleTimerVibrate,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setTimerDelay", "setTimerSound", "setTimerVibrate"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    toggleTimerVibrate({ object }) {
-      this.setTimerVibrate(object.checked);
-    },
-    showDelayList() {
-      let list = [
-        ...Array.from(Array(4), (_, x) => x + 1),
-        ...Array.from(Array(6), (_, x) => (x + 1) * 5),
-      ].map(
-        (e, i) => `${e} ${i == 0 ? localize("minute") : localize("minutes")}`
-      );
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "dlyDur",
-          list,
-        },
-      }).then((dur) => dur && this.setTimerDelay(dur));
-    },
-    showSoundsList() {
-      let tones = utils.getTones();
-      this.$showModal(ActionDialog, {
-        props: {
-          title: "tmrSnd",
-          list: tones.map((e) => e.title),
-        },
-      }).then(
-        (tone) =>
-          tone &&
-          tone !== this.timerSound.title &&
-          this.setTimerSound(tones.filter((e) => e.title === tone)[0])
-      );
-    },
-
-    // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/MPSettings.vue b/app/components/Settings/MPSettings.vue
deleted file mode 100644
index 44f39648..00000000
--- a/app/components/Settings/MPSettings.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'Settings' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-
-export default {
-  computed: {
-    ...mapState(["icon", "mondayFirst"]),
-    items() {
-      return [
-        {},
-        {
-          type: "switch",
-          icon: "week",
-          title: "swm",
-          checked: this.mondayFirst,
-          action: this.toggleFirstDay,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setFirstDay"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    toggleFirstDay({ object }) {
-      this.setFirstDay(object.checked);
-    },
-  },
-};
-</script>
diff --git a/app/components/Settings/Options.vue b/app/components/Settings/Options.vue
deleted file mode 100644
index 242540bb..00000000
--- a/app/components/Settings/Options.vue
+++ /dev/null
@@ -1,109 +0,0 @@
-<template>
-  <Page @loaded="onPageLoad" actionBarHidden="true">
-    <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'opts' | L" />
-        </v-template>
-        <v-template if="item.type == 'switch'">
-          <GridLayout columns="auto, *, auto" class="option">
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label
-                v-if="item.subTitle"
-                :text="item.subTitle | L"
-                class="sub"
-              />
-            </StackLayout>
-            <Switch
-              :color="item.checked ? '#ff5200' : '#adb5bd'"
-              col="2"
-              :checked="item.checked"
-              @checkedChange="item.action"
-            />
-          </GridLayout>
-        </v-template>
-        <v-template>
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-      </ListView>
-      <GridLayout
-        v-show="!toast"
-        row="1"
-        class="appbar"
-        rows="*"
-        columns="auto, *"
-      >
-        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
-      </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @tap="toast = null"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
-    </GridLayout>
-  </Page>
-</template>
-
-<script>
-import { Observable } from "@nativescript/core";
-import { mapState, mapActions } from "vuex";
-import { localize } from "@nativescript/localize";
-import * as utils from "~/shared/utils";
-
-export default {
-  data() {
-    return {
-      toast: null,
-    };
-  },
-  computed: {
-    ...mapState(["icon", "shakeEnabled"]),
-    items() {
-      return [
-        {},
-        {
-          type: "switch",
-          icon: "shuf",
-          title: "sVw",
-          subTitle: "sVwInfo",
-          checked: this.shakeEnabled,
-          action: this.toggleShake,
-        },
-        {},
-      ];
-    },
-  },
-  methods: {
-    ...mapActions(["setShake"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
-    },
-    // SHAKE VIEW RANDOM RECIPE
-    toggleShake({ object }) {
-      let checked = object.checked;
-      if (checked && !utils.hasAccelerometer()) {
-        object.checked = false;
-        this.toast = localize("noAccSensor");
-        utils.timer(5, (val) => {
-          if (!val) this.toast = val;
-        });
-      } else this.setShake(checked);
-    },
-  },
-};
-</script>
diff --git a/app/components/ViewRecipe.vue b/app/components/ViewRecipe.vue
index 39cdbdb5..5742d458 100644
--- a/app/components/ViewRecipe.vue
+++ b/app/components/ViewRecipe.vue
@@ -232,17 +232,7 @@
           @tap="shareHandler"
         />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        class="appbar snackBar"
-        columns="*"
-        @swipe="hideLastTried"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideLastTried" />
       <AbsoluteLayout rowSpan="2">
         <Image
           @tap="({ object }) => (object.cancel = true)"
@@ -269,17 +259,18 @@ import {
   Observable,
   Screen,
   CoreTypes,
-  Color,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 const intl = require("nativescript-intl");
 import { mapActions, mapState } from "vuex";
 import CookingTimer from "./CookingTimer.vue";
 import EditRecipe from "./EditRecipe.vue";
-import ActionDialog from "./modal/ActionDialog.vue";
-import PromptDialog from "./modal/PromptDialog.vue";
+import Action from "./modals/Action.vue";
+import Toast from "./sub/Toast.vue";
+import Prompt from "./modals/Prompt.vue";
 import * as utils from "~/shared/utils";
 export default {
+  components: { Toast },
   props: ["filterTrylater", "recipeID"],
   data() {
     return {
@@ -337,9 +328,8 @@ export default {
       "setRatingAction",
       "toggleCartAction",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       this.busy = this.photoOpen = false;
       this.setComponent("ViewRecipe");
       if (this.yieldMultiplier == this.recipe.yieldQuantity)
@@ -462,7 +452,7 @@ export default {
       return localize(title) + text;
     },
     changeYield() {
-      this.$showModal(PromptDialog, {
+      this.$showModal(Prompt, {
         props: {
           title: `${localize("req", localize(this.recipe.yieldUnit))}`,
           placeholder: Math.abs(parseFloat(this.yieldMultiplier)),
@@ -694,7 +684,7 @@ export default {
     // SHARE ACTION
     shareHandler() {
       if (this.recipe.image) {
-        this.$showModal(ActionDialog, {
+        this.$showModal(Action, {
           props: {
             title: "shr",
             list: ["rec", "pht"],
diff --git a/app/components/modal/ActionDialog.vue b/app/components/modals/Action.vue
similarity index 97%
rename from app/components/modal/ActionDialog.vue
rename to app/components/modals/Action.vue
index ee69d937..5ec66390 100644
--- a/app/components/modal/ActionDialog.vue
+++ b/app/components/modals/Action.vue
@@ -50,7 +50,7 @@
 import { Screen } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
-import ConfirmDialog from "./ConfirmDialog.vue";
+import Confirm from "./Confirm.vue";
 
 interface IData {
   newList: unknown[];
@@ -92,7 +92,7 @@ export default {
       this.$modal.close(item);
     },
     deletionConfirmation(description: string): void {
-      return this.$showModal(ConfirmDialog, {
+      return this.$showModal(Confirm, {
         props: {
           title: "conf",
           description,
diff --git a/app/components/modal/ActionDialogWithSearch.vue b/app/components/modals/ActionWithSearch.vue
similarity index 100%
rename from app/components/modal/ActionDialogWithSearch.vue
rename to app/components/modals/ActionWithSearch.vue
diff --git a/app/components/modal/ConfirmDialog.vue b/app/components/modals/Confirm.vue
similarity index 100%
rename from app/components/modal/ConfirmDialog.vue
rename to app/components/modals/Confirm.vue
diff --git a/app/components/modal/Filters.vue b/app/components/modals/Filter.vue
similarity index 100%
rename from app/components/modal/Filters.vue
rename to app/components/modals/Filter.vue
diff --git a/app/components/modal/PromptDialog.vue b/app/components/modals/Prompt.vue
similarity index 100%
rename from app/components/modal/PromptDialog.vue
rename to app/components/modals/Prompt.vue
diff --git a/app/components/modal/TimePicker.vue b/app/components/modals/TimePickerHM.vue
similarity index 100%
rename from app/components/modal/TimePicker.vue
rename to app/components/modals/TimePickerHM.vue
diff --git a/app/components/modal/CookingTimePicker.vue b/app/components/modals/TimePickerHMS.vue
similarity index 100%
rename from app/components/modal/CookingTimePicker.vue
rename to app/components/modals/TimePickerHMS.vue
diff --git a/app/components/Settings/About.vue b/app/components/settings/About.vue
similarity index 92%
rename from app/components/Settings/About.vue
rename to app/components/settings/About.vue
index cb25541a..d7cd9afe 100644
--- a/app/components/Settings/About.vue
+++ b/app/components/settings/About.vue
@@ -12,11 +12,7 @@
         </v-template>
         <v-template if="$index == 1">
           <StackLayout class="app-info">
-            <Image
-              class="icon"
-              src="res://logo"
-              stretch="none"
-            />
+            <Image class="icon" src="res://logo" stretch="none" />
             <Label class="name tb tac" :text="'EnRecipes' | L" />
             <Label :text="getVersion" class="version tb tac" />
 
@@ -99,9 +95,8 @@ export default {
     },
   },
   methods: {
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     // HELPERS
     openURL(url) {
diff --git a/app/components/settings/AppSettings.vue b/app/components/settings/AppSettings.vue
new file mode 100644
index 00000000..1cd499db
--- /dev/null
+++ b/app/components/settings/AppSettings.vue
@@ -0,0 +1,82 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" :action="navigateTo" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script lang="ts">
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import Interface from "./Interface.vue";
+import Options from "./Options.vue";
+import Database from "./Database.vue";
+import Reset from "./Reset.vue";
+import About from "./About.vue";
+import OptionsList from "../sub/OptionsList.vue";
+export default {
+  components: { OptionsList },
+  data() {
+    return {
+      items: [
+        {},
+        {
+          type: "list",
+          icon: "interface",
+          title: "intf",
+          data: Interface,
+        },
+        {
+          type: "list",
+          icon: "opts",
+          title: "opts",
+          data: Options,
+        },
+        {
+          type: "list",
+          icon: "db",
+          title: "db",
+          data: Database,
+        },
+        {
+          type: "list",
+          icon: "reset",
+          title: "rest",
+          data: Reset,
+        },
+        {
+          type: "list",
+          icon: "info",
+          title: "About",
+          data: About,
+        },
+        {},
+      ],
+    };
+  },
+  computed: {
+    ...mapState(["icon"]),
+  },
+  methods: {
+    ...mapActions(["setComponent"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+      this.setComponent("Settings");
+    },
+    // HELPERS
+    navigateTo(view) {
+      this.$navigateTo(view, {
+        transition: {
+          name: "slide",
+          duration: 200,
+          curve: "easeOut",
+        },
+      });
+    },
+  },
+};
+</script>
diff --git a/app/components/settings/CTSettings.vue b/app/components/settings/CTSettings.vue
new file mode 100644
index 00000000..2f94fb4c
--- /dev/null
+++ b/app/components/settings/CTSettings.vue
@@ -0,0 +1,134 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable, Device, Application, Utils } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import { localize } from "@nativescript/localize";
+import OptionsList from "../sub/OptionsList";
+import Action from "../modals/Action";
+import * as utils from "~/shared/utils";
+
+export default {
+  components: { OptionsList },
+  computed: {
+    ...mapState(["icon", "timerDelay", "timerSound", "timerVibrate"]),
+    items() {
+      let options = [
+        {
+          type: "list",
+          icon: "sound",
+          title: "tmrSnd",
+          subTitle: this.timerSound.title,
+          action: this.showSoundsList,
+        },
+        {
+          type: "switch",
+          icon: "vibrate",
+          title: "tmrvbrt",
+          checked: this.timerVibrate,
+          action: this.toggleTimerVibrate,
+        },
+      ];
+      let openSettings = [
+        {
+          type: "list",
+          icon: "sound",
+          title: "notifSetg",
+          subTitle: null,
+          action: this.openNotificationChannelSettings,
+        },
+      ];
+      let list = this.channelExists() ? openSettings : options;
+      return [
+        {},
+        {
+          type: "list",
+          icon: "delay",
+          title: "dlyDur",
+          subTitle: this.timerDelay,
+          action: this.showDelayList,
+        },
+        ...list,
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions([
+      "setTimerDelay",
+      "setTimerSound",
+      "setTimerVibrate",
+      "setComponent",
+    ]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+      this.setComponent("CTSettings");
+    },
+    showDelayList() {
+      let list = [
+        ...Array.from(Array(4), (_, x) => x + 1),
+        ...Array.from(Array(6), (_, x) => (x + 1) * 5),
+      ].map(
+        (e, i) => `${e} ${i == 0 ? localize("minute") : localize("minutes")}`
+      );
+      this.$showModal(Action, {
+        props: {
+          title: "dlyDur",
+          list,
+        },
+      }).then((dur) => dur && this.setTimerDelay(dur));
+    },
+    showSoundsList() {
+      let getTones = utils.getTones();
+      this.$showModal(Action, {
+        props: {
+          title: "tmrSnd",
+          list: getTones.tones.map((e) => e.title),
+        },
+      }).then(
+        (tone) =>
+          tone &&
+          tone !== this.timerSound.title &&
+          this.setTimerSound(getTones.tones.filter((e) => e.title === tone)[0])
+      );
+    },
+    toggleTimerVibrate() {
+      this.setTimerVibrate(!this.timerVibrate);
+    },
+    openNotificationChannelSettings() {
+      const ctx = Application.android.context;
+      const Settings = android.provider.Settings;
+      const Intent = android.content.Intent;
+      let intent = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS);
+      intent.putExtra(
+        Settings.EXTRA_APP_PACKAGE,
+        Application.android.packageName
+      );
+      intent.putExtra(Settings.EXTRA_CHANNEL_ID, "cta");
+      intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+      ctx.startActivity(intent);
+    },
+
+    // HELPERS
+    channelExists() {
+      if (Device.sdkVersion * 1 >= 26) {
+        const ctx = Utils.ad.getApplicationContext();
+        const NotifySrv = ctx.getSystemService(
+          android.content.Context.NOTIFICATION_SERVICE
+        );
+        return NotifySrv.getNotificationChannel("cta");
+      }
+      return null;
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Database.vue b/app/components/settings/Database.vue
similarity index 87%
rename from app/components/Settings/Database.vue
rename to app/components/settings/Database.vue
index 75dd6938..0bebcdac 100644
--- a/app/components/Settings/Database.vue
+++ b/app/components/settings/Database.vue
@@ -1,32 +1,7 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'db' | L" />
-        </v-template>
-        <v-template if="$index == 4">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1" verticalAlignment="center">
-              <Label :text="item.title | L" class="info" />
-              <Label v-if="item.subTitle" :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="db" :items="items" />
       <GridLayout
         v-show="!toast && !progress"
         row="1"
@@ -36,18 +11,7 @@
       >
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @tap="toast = null"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideToast" />
       <GridLayout
         v-show="progress"
         row="1"
@@ -75,12 +39,15 @@ import {
   getFileAccess,
 } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
-import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import Confirm from "../modals/Confirm";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
 import { mapState, mapActions } from "vuex";
 import { openOrCreate } from "@akylas/nativescript-sqlite";
 import * as utils from "~/shared/utils";
 
 export default {
+  components: { OptionsList, Toast },
   data() {
     return {
       backupFolder: null,
@@ -103,18 +70,21 @@ export default {
       return [
         {},
         {
+          type: "list",
           icon: "folder",
           title: "buFol",
           subTitle: this.backupFolder,
           action: this.setBackupFolder,
         },
         {
+          type: "list",
           icon: "exp",
           title: "expBu",
           subTitle: localize("buInfo"),
           action: this.exportCheck,
         },
         {
+          type: "list",
           icon: "imp",
           title: "impBu",
           subTitle: localize("impInfo"),
@@ -134,9 +104,8 @@ export default {
       "unlinkBrokenImages",
       "clearImportSummary",
     ]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
       const ContentResolver = Application.android.nativeApp.getContentResolver();
       this.backupFolder = ApplicationSettings.getString("backupFolder");
       if (
@@ -227,7 +196,7 @@ export default {
       this.progress = null;
       this.releaseBackEvent();
       let description = localize("buto", `"${filename}"`);
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "expSuc",
           description,
@@ -240,6 +209,7 @@ export default {
     openZipFile() {
       utils.getBackupFile().then((uri) => {
         if (uri) {
+          knownFolders.temp().clear();
           let dest = knownFolders.temp().path;
           utils.Zip.unzip(uri, dest)
             .then((res) => res && this.validateZipContent(res, uri))
@@ -346,7 +316,7 @@ export default {
       this.progress = null;
       this.releaseBackEvent();
       knownFolders.temp().clear();
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "impFail",
           description,
@@ -366,7 +336,7 @@ export default {
       const db = openOrCreate(recipesDB);
 
       // Import recipes
-      db.select(`SELECT * FROM recipes`).then((res) => {
+      db.select("SELECT * FROM recipes").then((res) => {
         this.importRecipesFromDB(res);
       });
 
@@ -426,7 +396,7 @@ export default {
       Folder.fromPath(destPath);
       utils.Zip.unzip(uri, destPath).then((res) => {
         if (res) {
-          // delete unzipped json files
+          // delete unzipped data files
           Folder.fromPath(path.join(destPath, "EnRecipes"))
             .getEntities()
             .then((entities) => {
@@ -444,13 +414,12 @@ export default {
     showImportSummary() {
       this.progress = null;
       this.releaseBackEvent();
-      knownFolders.temp().clear();
       let { found, imported, updated } = this.importSummary;
       let exists = Math.abs(found - imported - updated) + updated;
       let importedNote = `\n${localize("recI")} ${imported}`;
       let existsNote = `\n${localize("recE")} ${exists}`;
       let updatedNote = `\n${localize("recU")} ${updated}`;
-      this.$showModal(ConfirmDialog, {
+      this.$showModal(Confirm, {
         props: {
           title: "impSuc",
           description: `${found} ${localize(
@@ -479,9 +448,8 @@ export default {
     },
 
     // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
+    hideToast() {
+      this.toast = null;
     },
   },
 };
diff --git a/app/components/Settings/Interface.vue b/app/components/settings/Interface.vue
similarity index 71%
rename from app/components/Settings/Interface.vue
rename to app/components/settings/Interface.vue
index 38caf114..be65f6eb 100644
--- a/app/components/Settings/Interface.vue
+++ b/app/components/settings/Interface.vue
@@ -1,32 +1,7 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'intf' | L" />
-        </v-template>
-        <v-template if="$index == 4">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.action)"
-          >
-            <Label class="ico" :text="icon[item.icon]" />
-            <StackLayout col="1">
-              <Label :text="item.title | L" class="info" />
-              <Label :text="item.subTitle" class="sub" />
-            </StackLayout>
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="intf" :items="items" />
       <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
@@ -42,12 +17,14 @@ import {
   Frame,
 } from "@nativescript/core";
 import { localize, overrideLocale } from "@nativescript/localize";
-import ActionDialog from "../modal/ActionDialog.vue";
-import ConfirmDialog from "../modal/ConfirmDialog.vue";
+import Action from "../modals/Action";
+import Confirm from "../modals/Confirm";
+import OptionsList from "../sub/OptionsList";
 import { mapState, mapActions } from "vuex";
 import * as utils from "~/shared/utils";
 
 export default {
+  components: { OptionsList },
   data() {
     return {
       appLanguage: "English",
@@ -59,12 +36,14 @@ export default {
       return [
         {},
         {
+          type: "list",
           icon: "lang",
           title: "lang",
           subTitle: this.appLanguage,
           action: this.selectAppLanguage,
         },
         {
+          type: "list",
           icon: "theme",
           title: "Theme",
           subTitle: localize(
@@ -73,6 +52,7 @@ export default {
           action: this.selectThemes,
         },
         {
+          type: "list",
           icon: "layout",
           title: "listVM",
           subTitle: localize(this.layout),
@@ -84,14 +64,13 @@ export default {
   },
   methods: {
     ...mapActions(["setTheme", "setLayout"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     // LANGUAGE SELECTION
     selectAppLanguage() {
       let languages = this.language.map((e) => e.title);
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "lang",
           list: [...languages],
@@ -102,7 +81,7 @@ export default {
           let locale = this.language.filter((e) => e.title === action)[0]
             .locale;
           if (currentLocale !== locale) {
-            this.$showModal(ConfirmDialog, {
+            this.$showModal(Confirm, {
               props: {
                 title: "appRst",
                 description: localize("nLangInfo"),
@@ -123,7 +102,7 @@ export default {
     },
     // THEME SELECTION
     selectThemes() {
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "Theme",
           list: ["Light", "Dark", "Black", "sysDef", "sysDefB"],
@@ -142,7 +121,7 @@ export default {
     },
     // LAYOUT MODE
     setLayoutMode() {
-      this.$showModal(ActionDialog, {
+      this.$showModal(Action, {
         props: {
           title: "listVM",
           list: ["detailed", "grid", "photogrid", "simple", "minimal"],
@@ -155,13 +134,8 @@ export default {
         }
       });
     },
-    // HELPERS
-    touch({ object, action }, method) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") method();
-    },
   },
-  mounted() {
+  created() {
     this.appLanguage = ApplicationSettings.getString(
       "appLanguage",
       localize("sysDef")
diff --git a/app/components/settings/MPSettings.vue b/app/components/settings/MPSettings.vue
new file mode 100644
index 00000000..ce164690
--- /dev/null
+++ b/app/components/settings/MPSettings.vue
@@ -0,0 +1,45 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="Settings" :items="items" />
+      <GridLayout row="1" class="appbar" rows="*" columns="auto, *">
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import OptionsList from "../sub/OptionsList";
+
+export default {
+  components: { OptionsList },
+  computed: {
+    ...mapState(["icon", "mondayFirst"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "week",
+          title: "swm",
+          checked: this.mondayFirst,
+          action: this.toggleFirstDay,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setFirstDay"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+    },
+    toggleFirstDay() {
+      this.setFirstDay(!this.mondayFirst);
+    },
+  },
+};
+</script>
diff --git a/app/components/settings/Options.vue b/app/components/settings/Options.vue
new file mode 100644
index 00000000..ed75b272
--- /dev/null
+++ b/app/components/settings/Options.vue
@@ -0,0 +1,69 @@
+<template>
+  <Page @loaded="onPageLoad" actionBarHidden="true">
+    <GridLayout rows="*, auto" columns="auto, *">
+      <OptionsList title="opts" :items="items" />
+      <GridLayout
+        v-show="!toast"
+        row="1"
+        class="appbar"
+        rows="*"
+        columns="auto, *"
+      >
+        <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
+      </GridLayout>
+      <Toast :toast="toast" :action="(toast = null)" />
+    </GridLayout>
+  </Page>
+</template>
+
+<script>
+import { Observable } from "@nativescript/core";
+import { mapState, mapActions } from "vuex";
+import { localize } from "@nativescript/localize";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
+import * as utils from "~/shared/utils";
+
+export default {
+  components: { OptionsList, Toast },
+  data() {
+    return {
+      toast: null,
+    };
+  },
+  computed: {
+    ...mapState(["icon", "shakeEnabled"]),
+    items() {
+      return [
+        {},
+        {
+          type: "switch",
+          icon: "shuf",
+          title: "sVw",
+          subTitle: "sVwInfo",
+          checked: this.shakeEnabled,
+          action: this.toggleShake,
+        },
+        {},
+      ];
+    },
+  },
+  methods: {
+    ...mapActions(["setShake"]),
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
+    },
+
+    // SHAKE VIEW RANDOM RECIPE
+    toggleShake() {
+      let checked = this.shakeEnabled;
+      if (checked && !utils.hasAccelerometer()) {
+        this.toast = localize("noAccSensor");
+        utils.timer(5, (val) => {
+          if (!val) this.toast = val;
+        });
+      } else this.setShake(!checked);
+    },
+  },
+};
+</script>
diff --git a/app/components/Settings/Reset.vue b/app/components/settings/Reset.vue
similarity index 54%
rename from app/components/Settings/Reset.vue
rename to app/components/settings/Reset.vue
index 5c6547b4..fb5b4429 100644
--- a/app/components/Settings/Reset.vue
+++ b/app/components/settings/Reset.vue
@@ -1,34 +1,9 @@
 <template>
   <Page @loaded="onPageLoad" actionBarHidden="true">
     <GridLayout rows="*, auto" columns="auto, *">
-      <ListView
-        colSpan="2"
-        rowSpan="2"
-        class="options-list"
-        for="item in items"
-      >
-        <v-template if="$index == 0">
-          <Label class="pageTitle" :text="'rest' | L" />
-        </v-template>
-        <v-template if="$index == 5">
-          <Label class="group-info sub tw" :text="'restInfo' | L" />
-        </v-template>
-        <v-template if="$index == 6">
-          <StackLayout class="listSpace"> </StackLayout>
-        </v-template>
-        <v-template>
-          <GridLayout
-            columns="auto, *"
-            class="option"
-            @touch="touch($event, item.type)"
-          >
-            <Label class="ico" :text="icon.reset" />
-            <Label col="1" :text="item.title | L" class="info" />
-          </GridLayout>
-        </v-template>
-      </ListView>
+      <OptionsList title="rest" :items="items" :action="resetListItems" />
       <GridLayout
-        v-show="!toast"
+        :hidden="toast"
         row="1"
         class="appbar"
         @loaded="onAppBarLoad"
@@ -36,18 +11,7 @@
       >
         <Button class="ico" :text="icon.back" @tap="$navigateBack()" />
       </GridLayout>
-      <GridLayout
-        v-show="toast"
-        row="1"
-        colSpan="2"
-        class="appbar snackBar"
-        columns="*"
-        @swipe="hideToast"
-      >
-        <FlexboxLayout minHeight="48" alignItems="center">
-          <Label class="title msg" :text="toast" />
-        </FlexboxLayout>
-      </GridLayout>
+      <Toast :toast="toast" :action="hideToast" />
     </GridLayout>
   </Page>
 </template>
@@ -57,7 +21,10 @@ import { Observable, CoreTypes } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
 import * as utils from "~/shared/utils";
+import OptionsList from "../sub/OptionsList";
+import Toast from "../sub/Toast";
 export default {
+  components: { OptionsList, Toast },
   data() {
     return {
       toast: null,
@@ -70,20 +37,28 @@ export default {
       return [
         {},
         {
-          type: "cuisines",
+          type: "list",
+          icon: "reset",
           title: "restCuiL",
+          data: "cuisines",
         },
         {
-          type: "categories",
+          type: "list",
+          icon: "reset",
           title: "restCatL",
+          data: "categories",
         },
         {
-          type: "yieldUnits",
+          type: "list",
+          icon: "reset",
           title: "restYUL",
+          data: "yieldUnits",
         },
         {
-          type: "units",
+          type: "list",
+          icon: "reset",
           title: "restUL",
+          data: "units",
         },
         {},
         {},
@@ -92,9 +67,8 @@ export default {
   },
   methods: {
     ...mapActions(["resetListItemsAction"]),
-    onPageLoad(args) {
-      const page = args.object;
-      page.bindingContext = new Observable();
+    onPageLoad({ object }) {
+      object.bindingContext = new Observable();
     },
     onAppBarLoad({ object }) {
       this.appbar = object;
@@ -111,6 +85,7 @@ export default {
       });
     },
     hideToast({ object }) {
+      this.appbar.translateY = 64;
       object
         .animate({
           opacity: 0,
@@ -120,7 +95,7 @@ export default {
         })
         .then(() => {
           this.showUndo = false;
-          this.appbar.translateY = 64;
+          this.toast = null;
           this.appbar.animate({
             translate: { x: 0, y: 0 },
             duration: 250,
@@ -128,13 +103,8 @@ export default {
           });
           object.opacity = 1;
           object.translateY = 0;
-          this.toast = null;
         });
     },
-    touch({ object, action }, type) {
-      object.className = action.match(/down|move/) ? "option fade" : "option";
-      if (action == "up") this.resetListItems(type);
-    },
   },
 };
 </script>
diff --git a/app/components/sub/OptionsList.vue b/app/components/sub/OptionsList.vue
new file mode 100644
index 00000000..99b1f752
--- /dev/null
+++ b/app/components/sub/OptionsList.vue
@@ -0,0 +1,62 @@
+<template>
+  <ListView colSpan="2" rowSpan="2" class="options-list" for="item in items">
+    <v-template if="$index == 0">
+      <Label class="pageTitle" :text="title | L" />
+    </v-template>
+    <v-template if="item.type == 'switch'">
+      <GridLayout
+        columns="auto, *, auto"
+        class="option"
+        @touch="touch($event, item.data, item.action)"
+      >
+        <Label class="ico" :text="icon[item.icon]" />
+        <StackLayout col="1" verticalAlignment="center">
+          <Label :text="item.title | L" class="info" />
+          <Label v-if="item.subTitle" :text="item.subTitle | L" class="sub" />
+        </StackLayout>
+        <Switch
+          isUserInteractionEnabled="false"
+          :color="item.checked ? '#ff5200' : '#adb5bd'"
+          col="2"
+          :checked="item.checked"
+        />
+      </GridLayout>
+    </v-template>
+    <v-template if="item.type == 'list'">
+      <GridLayout
+        columns="auto, *"
+        class="option"
+        @touch="touch($event, item.data, item.action)"
+      >
+        <Label class="ico" :text="icon[item.icon]" />
+        <StackLayout col="1">
+          <Label :text="item.title | L" class="info" />
+          <Label v-if="item.subTitle" :text="item.subTitle" class="sub" />
+        </StackLayout>
+      </GridLayout>
+    </v-template>
+    <v-template if="item.type == 'info'">
+      <Label class="group-info sub tw" :text="item.title | L" />
+    </v-template>
+    <v-template>
+      <StackLayout class="listSpace"> </StackLayout>
+    </v-template>
+  </ListView>
+</template>
+
+<script>
+import { mapState } from "vuex";
+
+export default {
+  props: ["title", "items", "action"],
+  computed: {
+    ...mapState(["icon"]),
+  },
+  methods: {
+    touch({ object, action }, data, localAction) {
+      object.className = action.match(/down|move/) ? "option fade" : "option";
+      if (action == "up") localAction ? localAction(data) : this.action(data);
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/app/components/sub/SnackBar.vue b/app/components/sub/SnackBar.vue
new file mode 100644
index 00000000..096106a9
--- /dev/null
+++ b/app/components/sub/SnackBar.vue
@@ -0,0 +1,23 @@
+<template>
+  <GridLayout
+    row="1"
+    class="appbar snackBar"
+    columns="auto, *, auto"
+    @swipe="action"
+  >
+    <Button :text="count" class="ico countdown tb" />
+    <Label class="title" col="1" :text="msg | L" />
+    <Button class="ico fab" :text="icon.undo" @tap="undo" col="3" />
+  </GridLayout>
+</template>
+
+<script>
+import { mapState } from "vuex";
+
+export default {
+  props: ["count", "msg", "undo", "action"],
+  computed: {
+    ...mapState(["icon"]),
+  },
+};
+</script>
\ No newline at end of file
diff --git a/app/components/SingleTimer.vue b/app/components/sub/Timer.vue
similarity index 96%
rename from app/components/SingleTimer.vue
rename to app/components/sub/Timer.vue
index c238da96..aa58df67 100644
--- a/app/components/SingleTimer.vue
+++ b/app/components/sub/Timer.vue
@@ -48,7 +48,7 @@
 import { ApplicationSettings, Application } from "@nativescript/core";
 import { localize } from "@nativescript/localize";
 import { mapState, mapActions } from "vuex";
-import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue";
+import ActionWithSearch from "../modals/ActionWithSearch";
 import * as utils from "~/shared/utils";
 import { EventBus } from "~/main";
 
@@ -92,7 +92,7 @@ export default {
   methods: {
     ...mapActions(["removeActiveTimer", "updateActiveTimer", "addTimerPreset"]),
     attachRecipe() {
-      this.$showModal(ActionDialogWithSearch, {
+      this.$showModal(ActionWithSearch, {
         props: {
           title: "selRec",
           recipes: this.recipes,
@@ -140,7 +140,7 @@ export default {
     },
     clearNotification() {
       Application.android.unregisterBroadcastReceiver("timer" + this.timer.id);
-      utils.TimerNotification.clear(this.timer.id);
+      utils.TimerNotif.clear(this.timer.id);
     },
     toggleProgress(bool) {
       this.togglePause(this.timer, bool);
diff --git a/app/components/sub/Toast.vue b/app/components/sub/Toast.vue
new file mode 100644
index 00000000..4c54cef6
--- /dev/null
+++ b/app/components/sub/Toast.vue
@@ -0,0 +1,20 @@
+<template>
+  <GridLayout
+    v-show="toast"
+    row="1"
+    colSpan="2"
+    class="appbar snackBar"
+    columns="*"
+    @swipe="action"
+  >
+    <FlexboxLayout minHeight="48" alignItems="center">
+      <Label class="title msg" :text="toast" />
+    </FlexboxLayout>
+  </GridLayout>
+</template>
+
+<script>
+export default {
+  props: ["toast", "action"],
+};
+</script>
\ No newline at end of file
diff --git a/app/i18n/en-GB.default.json b/app/i18n/en-GB.default.json
index caa44806..2c8da6f3 100644
--- a/app/i18n/en-GB.default.json
+++ b/app/i18n/en-GB.default.json
@@ -309,5 +309,6 @@
   "hour": "hour",
   "hours": "hours",
   "seconds": "seconds",
-  "tmrClr": "Timer cleared"
+  "tmrRm": "Timer removed",
+  "notifSetg": "Notification settings"
 }
diff --git a/app/main.ts b/app/main.ts
index 4476a03b..dff0a56c 100644
--- a/app/main.ts
+++ b/app/main.ts
@@ -2,9 +2,27 @@ import {
   localize,
   androidLaunchEventLocalizationHandler,
 } from '@nativescript/localize'
-import { on, launchEvent } from '@nativescript/core/application'
+import { Application, AndroidApplication, Utils } from '@nativescript/core'
 
-on(launchEvent, ({ android }) => {
+const keepScreenOn = () => {
+  let ctx = Utils.ad.getApplicationContext()
+  const pm = ctx.getSystemService(android.content.Context.POWER_SERVICE)
+  let isScreenOff = !pm.isInteractive()
+  if (isScreenOff) {
+    console.log('keepScreenOn')
+    const window = Application.android.startActivity.getWindow()
+    const windowMgr = android.view.WindowManager
+    window.addFlags(
+      windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+        windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
+        windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
+    )
+  }
+}
+Application.on(Application.resumeEvent, keepScreenOn)
+
+Application.on(Application.launchEvent, ({ android }) => {
+  console.log('launching')
   if (android) androidLaunchEventLocalizationHandler()
 })
 
@@ -17,7 +35,7 @@ export const EventBus = new Vue()
 import CollectionView from '@nativescript-community/ui-collectionview/vue'
 Vue.use(CollectionView)
 
-import { lvMixin } from './shared/mixins.js'
+import { lvMixin } from './shared/mixins'
 Vue.mixin(lvMixin)
 
 Vue.config.silent = false
diff --git a/app/resources/Android/src/main/AndroidManifest.xml b/app/resources/Android/src/main/AndroidManifest.xml
index 62af1b2c..3956f81d 100644
--- a/app/resources/Android/src/main/AndroidManifest.xml
+++ b/app/resources/Android/src/main/AndroidManifest.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="__PACKAGE__" android:versionCode="10000" android:versionName="1.0">
 	<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" />
+	<uses-permission android:name="android.permission.VIBRATE" />
+	<uses-permission android:name="android.permission.WAKE_LOCK" />
+	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.CAMERA" tools:node="remove" />
 	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove" />
-	<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-	<uses-permission android:name="android.permission.WAKE_LOCK" />
-	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" tools:node="remove" />
 	<uses-permission android:name="android.permission.INTERNET" tools:node="remove" />
 	<uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove" />
 	<application android:extractNativeLibs="true" android:name="com.tns.NativeScriptApplication" android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:hardwareAccelerated="true" android:largeHeap="true" android:theme="@style/AppTheme">
-		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:launchMode="singleTop" android:screenOrientation="userPortrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode" android:theme="@style/LaunchScreenTheme" android:windowSoftInputMode="adjustResize">
+		<activity android:name="com.tns.NativeScriptActivity" android:label="@string/title_activity_kimera" android:launchMode="singleInstance" android:screenOrientation="userPortrait" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize|screenLayout|locale|uiMode" android:theme="@style/LaunchScreenTheme" android:windowSoftInputMode="adjustResize">
 			<meta-data android:name="SET_THEME_ON_LAUNCH" android:resource="@style/AppTheme" />
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
@@ -19,6 +20,7 @@
 			</intent-filter>
 		</activity>
 		<activity android:name="com.tns.ErrorReportActivity" />
+		<service android:name="com.tns.ForegroundService" android:enabled="true" android:exported="false" />
 		<provider android:name="androidx.core.content.FileProvider" android:exported="false" android:authorities="${applicationId}.provider" android:grantUriPermissions="true">
 			<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider" />
 		</provider>
diff --git a/app/resources/Android/src/main/res/values-ar/strings.xml b/app/resources/Android/src/main/res/values-ar/strings.xml
index 5ae6f254..08840dd5 100644
--- a/app/resources/Android/src/main/res/values-ar/strings.xml
+++ b/app/resources/Android/src/main/res/values-ar/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"أضف"</string>
   <string name="About">"حول"</string>
   <string name="aap">"ألحق صورة"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ca/strings.xml b/app/resources/Android/src/main/res/values-ca/strings.xml
index fcae9396..8931d5d7 100644
--- a/app/resources/Android/src/main/res/values-ca/strings.xml
+++ b/app/resources/Android/src/main/res/values-ca/strings.xml
@@ -90,7 +90,8 @@
   <string name="allTs">"Totes les etiquetes"</string>
   <string name="allCats">"Totes les categories"</string>
   <string name="About">"Quant a"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aD">"All done!"</string>
   <string name="aBtn">"ADD"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-da/strings.xml b/app/resources/Android/src/main/res/values-da/strings.xml
index f4017783..f0da2471 100644
--- a/app/resources/Android/src/main/res/values-da/strings.xml
+++ b/app/resources/Android/src/main/res/values-da/strings.xml
@@ -313,4 +313,6 @@
   <string name="American">"American"</string>
   <string name="aD">"Fuldendt!"</string>
   <string name="About">"Om"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-de/strings.xml b/app/resources/Android/src/main/res/values-de/strings.xml
index 26285ab6..4b6c6923 100644
--- a/app/resources/Android/src/main/res/values-de/strings.xml
+++ b/app/resources/Android/src/main/res/values-de/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"HINZUFÜGEN"</string>
   <string name="About">"Über"</string>
   <string name="aap">"Foto anhängen"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-en-rIN/strings.xml b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
index b583ec4c..c40b78ae 100644
--- a/app/resources/Android/src/main/res/values-en-rIN/strings.xml
+++ b/app/resources/Android/src/main/res/values-en-rIN/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-en-rUS/strings.xml b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
index 10aa5e77..8abaf9d7 100644
--- a/app/resources/Android/src/main/res/values-en-rUS/strings.xml
+++ b/app/resources/Android/src/main/res/values-en-rUS/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-es-rAR/strings.xml b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
index 2b3f6afb..6ee9f9b3 100644
--- a/app/resources/Android/src/main/res/values-es-rAR/strings.xml
+++ b/app/resources/Android/src/main/res/values-es-rAR/strings.xml
@@ -20,7 +20,8 @@
   <string name="aStpBtn">"AGREGAR PASO"</string>
   <string name="August">"Agosto"</string>
   <string name="sec">"s"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="title_activity_kimera">"EnRecipes"</string>
   <string name="allTs">"All Tags"</string>
   <string name="allCuis">"All Cuisines"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-es/strings.xml b/app/resources/Android/src/main/res/values-es/strings.xml
index cb0422f4..f2acde4a 100644
--- a/app/resources/Android/src/main/res/values-es/strings.xml
+++ b/app/resources/Android/src/main/res/values-es/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AÑADIR"</string>
   <string name="About">"Acerca de"</string>
   <string name="aap">"Adjuntar una foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fi/strings.xml b/app/resources/Android/src/main/res/values-fi/strings.xml
index dbb04b14..dcd130d5 100644
--- a/app/resources/Android/src/main/res/values-fi/strings.xml
+++ b/app/resources/Android/src/main/res/values-fi/strings.xml
@@ -309,8 +309,10 @@
   <string name="aBtn">"LISÄÄ"</string>
   <string name="About">"Tietoja"</string>
   <string name="aap">"Liitä valokuva"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="tmrvbrt">"Timer vibrate"</string>
   <string name="delay">"Delay"</string>
   <string name="strtBtn">"START"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
index b040193e..1b1f01f6 100644
--- a/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rBE/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
index c29559c6..a38eaa2c 100644
--- a/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCA/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
index 7a0d42b5..36631328 100644
--- a/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr-rCH/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-fr/strings.xml b/app/resources/Android/src/main/res/values-fr/strings.xml
index 0f02331e..333240ba 100644
--- a/app/resources/Android/src/main/res/values-fr/strings.xml
+++ b/app/resources/Android/src/main/res/values-fr/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AJOUTER"</string>
   <string name="About">"À propos"</string>
   <string name="aap">"Joindre une photo"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-hi/strings.xml b/app/resources/Android/src/main/res/values-hi/strings.xml
index 3727273b..edf58ac0 100644
--- a/app/resources/Android/src/main/res/values-hi/strings.xml
+++ b/app/resources/Android/src/main/res/values-hi/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"जोड़ें"</string>
   <string name="About">"तकरीबन"</string>
   <string name="aap">"एक तस्वीर लगाओ"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-id/strings.xml b/app/resources/Android/src/main/res/values-id/strings.xml
index 5b9776e9..0f6571b1 100644
--- a/app/resources/Android/src/main/res/values-id/strings.xml
+++ b/app/resources/Android/src/main/res/values-id/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"Tambah"</string>
   <string name="About">"Tentang"</string>
   <string name="aap">"Lampirkan foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-it/strings.xml b/app/resources/Android/src/main/res/values-it/strings.xml
index 0addf598..3fc11eab 100644
--- a/app/resources/Android/src/main/res/values-it/strings.xml
+++ b/app/resources/Android/src/main/res/values-it/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"AGGIUNGI"</string>
   <string name="About">"Informazioni"</string>
   <string name="aap">"Allega una foto"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ja/strings.xml b/app/resources/Android/src/main/res/values-ja/strings.xml
index 3c98214e..8295639c 100644
--- a/app/resources/Android/src/main/res/values-ja/strings.xml
+++ b/app/resources/Android/src/main/res/values-ja/strings.xml
@@ -289,7 +289,8 @@
   <string name="aBtn">"追加"</string>
   <string name="About">"アプリについて"</string>
   <string name="aap">"写真を添付"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="_app_name_1k3Sbz">"EnRecipes"</string>
   <string name="app_name">"EnRecipes"</string>
   <string name="title_activity_kimera">"EnRecipes"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-kn/strings.xml b/app/resources/Android/src/main/res/values-kn/strings.xml
index 00104094..d91f9e1d 100644
--- a/app/resources/Android/src/main/res/values-kn/strings.xml
+++ b/app/resources/Android/src/main/res/values-kn/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ml/strings.xml b/app/resources/Android/src/main/res/values-ml/strings.xml
index 3f79d599..d1e54ef9 100644
--- a/app/resources/Android/src/main/res/values-ml/strings.xml
+++ b/app/resources/Android/src/main/res/values-ml/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"ചേർക്കുക"</string>
   <string name="About">"കുറിച്ച്"</string>
   <string name="aap">"ഒരു ഫോട്ടോ അറ്റാച്ചുചെയ്യുക"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
index 6fad27d7..8f15b3f7 100644
--- a/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
+++ b/app/resources/Android/src/main/res/values-nb-rNO/strings.xml
@@ -294,7 +294,8 @@
   <string name="aBtn">"Legg til"</string>
   <string name="About">"Om"</string>
   <string name="aap">"Legg ved et bilde"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="strtBtn">"START"</string>
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-nl/strings.xml b/app/resources/Android/src/main/res/values-nl/strings.xml
index eefee2b7..0eac0b0e 100644
--- a/app/resources/Android/src/main/res/values-nl/strings.xml
+++ b/app/resources/Android/src/main/res/values-nl/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"TOEVOEGEN"</string>
   <string name="About">"Over"</string>
   <string name="aap">"Foto bijvoegen"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
index 9cc2f3fc..51aca148 100644
--- a/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt-rBR/strings.xml
@@ -313,4 +313,6 @@
   <string name="aD">"Tudo feito!"</string>
   <string name="aBtn">"ADICIONAR"</string>
   <string name="About">"Sobre"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-pt/strings.xml b/app/resources/Android/src/main/res/values-pt/strings.xml
index d8d3f7b9..5b9a1e06 100644
--- a/app/resources/Android/src/main/res/values-pt/strings.xml
+++ b/app/resources/Android/src/main/res/values-pt/strings.xml
@@ -313,4 +313,6 @@
   <string name="American">"Americana"</string>
   <string name="About">"Sobre"</string>
   <string name="aap">"Anexar uma fotografia"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ru/strings.xml b/app/resources/Android/src/main/res/values-ru/strings.xml
index f6ea48c8..a4e703a1 100644
--- a/app/resources/Android/src/main/res/values-ru/strings.xml
+++ b/app/resources/Android/src/main/res/values-ru/strings.xml
@@ -313,4 +313,6 @@
   <string name="aBtn">"ДОБАВИТЬ"</string>
   <string name="About">"О приложении"</string>
   <string name="aap">"Прикрепить фото"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-ta/strings.xml b/app/resources/Android/src/main/res/values-ta/strings.xml
index 1bf92994..a58630a4 100644
--- a/app/resources/Android/src/main/res/values-ta/strings.xml
+++ b/app/resources/Android/src/main/res/values-ta/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"சேர்"</string>
   <string name="About">"பற்றி"</string>
   <string name="aap">"புகைப்படத்தை இணைக்கவும்"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values-te/strings.xml b/app/resources/Android/src/main/res/values-te/strings.xml
index 8d6d0171..3dd25ff9 100644
--- a/app/resources/Android/src/main/res/values-te/strings.xml
+++ b/app/resources/Android/src/main/res/values-te/strings.xml
@@ -293,7 +293,8 @@
   <string name="aBtn">"చేర్చు"</string>
   <string name="About">"గురించి"</string>
   <string name="aap">"ఫోటోను అటాచ్ చేయండి"</string>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="ntmr">"New timer"</string>
   <string name="timer">"Cooking Timer"</string>
   <string name="sec">"sec"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/resources/Android/src/main/res/values/strings.xml b/app/resources/Android/src/main/res/values/strings.xml
index 00104094..d91f9e1d 100644
--- a/app/resources/Android/src/main/res/values/strings.xml
+++ b/app/resources/Android/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="tmrClr">"Timer cleared"</string>
+  <string name="notifSetg">"Notification settings"</string>
+  <string name="tmrRm">"Timer removed"</string>
   <string name="seconds">"seconds"</string>
   <string name="hours">"hours"</string>
   <string name="hour">"hour"</string>
@@ -313,4 +314,5 @@
   <string name="aBtn">"ADD"</string>
   <string name="About">"About"</string>
   <string name="aap">"Attach a photo"</string>
+  <string name="tmrClr">"tmrClr"</string>
 </resources>
diff --git a/app/shared/mixins.js b/app/shared/mixins.ts
similarity index 96%
rename from app/shared/mixins.js
rename to app/shared/mixins.ts
index b317bc85..39d041f0 100644
--- a/app/shared/mixins.js
+++ b/app/shared/mixins.ts
@@ -1,3 +1,5 @@
+declare const android: any
+
 export const lvMixin = {
   methods: {
     transparentPage({ object }) {
diff --git a/app/shared/utils.js b/app/shared/utils.ts
similarity index 86%
rename from app/shared/utils.js
rename to app/shared/utils.ts
index 608839af..6623897d 100644
--- a/app/shared/utils.js
+++ b/app/shared/utils.ts
@@ -8,6 +8,8 @@ import {
   knownFolders,
 } from '@nativescript/core'
 let timerOne
+declare const global, android, androidx, com, java, Array: any
+
 export const restartApp = () => {
   const ctx = Utils.ad.getApplicationContext()
   let mStartActivity = new android.content.Intent(
@@ -93,11 +95,12 @@ export const getRecipePhoto = () => {
     android.content.Intent.ACTION_GET_CONTENT
   )
   intent.setType('image/*')
-  return callIntent(ctx, intent, 'Select photo', DIR_CODE).then((res) => {
-    if (res.resultCode === android.app.Activity.RESULT_OK)
-      if (res.intent != null && res.intent.getData())
-        return res.intent.getData()
-  })
+  return callIntent(ctx, intent, 'Select photo', DIR_CODE).then(
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK)
+        if (intent != null && intent.getData()) return intent.getData()
+    }
+  )
 }
 export const copyPhotoToCache = (uri, filepath) => {
   const ContentResolver = Application.android.nativeApp.getContentResolver()
@@ -129,7 +132,7 @@ export const copyDBToExport = () => {
   const input = new java.io.FileInputStream(src)
   try {
     const output = new java.io.FileOutputStream(dst)
-    let len
+    let len: number
     let buffer = Array.create('byte', 1024)
     while ((len = input.read(buffer)) > 0) output.write(buffer, 0, len)
   } catch (error) {
@@ -147,11 +150,12 @@ export const getBackupFolder = () => {
   const intent = new android.content.Intent(
     android.content.Intent.ACTION_OPEN_DOCUMENT_TREE
   )
-  return callIntent(ctx, intent, 'Select folder', DIR_CODE).then((res) => {
-    if (res.resultCode === android.app.Activity.RESULT_OK)
-      if (res.intent != null && res.intent.getData())
-        return res.intent.getData()
-  })
+  return callIntent(ctx, intent, 'Select folder', DIR_CODE).then(
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK)
+        if (intent != null && intent.getData()) return intent.getData()
+    }
+  )
 }
 
 // BACKUP FILE PICKER
@@ -165,10 +169,9 @@ export const getBackupFile = () => {
   intent.addCategory(android.content.Intent.CATEGORY_OPENABLE)
   intent.setType('application/zip')
   return callIntent(ctx, intent, 'Select file to import', DIR_CODE).then(
-    (res) => {
-      if (res.resultCode === android.app.Activity.RESULT_OK) {
-        if (res.intent != null && res.intent.getData())
-          return res.intent.getData()
+    ({ resultCode, intent }: any) => {
+      if (resultCode === android.app.Activity.RESULT_OK) {
+        if (intent != null && intent.getData()) return intent.getData()
       }
     }
   )
@@ -176,7 +179,7 @@ export const getBackupFile = () => {
 
 // ZIP OPERATIONS
 export class Zip {
-  static getSubFiles(src, isRootFolder) {
+  static getSubFiles(src: string, isRootFolder?: boolean) {
     const fileList = new java.util.ArrayList()
     const sourceFile = new java.io.File(src)
     let tempList = sourceFile.listFiles()
@@ -301,8 +304,8 @@ export const shareImage = (image, subject) => {
 }
 
 // TIMER NOTIFICATION
-export class TimerNotification {
-  static getResource(ctx, icon) {
+export class TimerNotif {
+  static getIcon(ctx, icon) {
     const packageName = ctx.getApplicationInfo().packageName
     let resources = ctx.getResources()
     return (
@@ -328,36 +331,33 @@ export class TimerNotification {
     sound,
     title,
     vibrate,
+  }: {
+    actions?: boolean
+    bID: string
+    cID: string
+    cName: string
+    description: string
+    nID: number
+    priority: number
+    sound: string
+    title: string
+    vibrate?: number
   }) {
-    let sdkv = Device.sdkVersion * 1
-    let soundUri
+    let sdkv: number = parseInt(Device.sdkVersion)
+    let soundUri: any
     if (sound) soundUri = new android.net.Uri.parse(sound)
     const NotifyMgr = android.app.NotificationManager
     let ctx = Utils.ad.getApplicationContext()
     const NotifySrv = ctx.getSystemService(
       android.content.Context.NOTIFICATION_SERVICE
     )
-
-    if (priority) {
-      // Show over lock screen
-      Application.android.on(AndroidApplication.activityResumedEvent, () => {
-        const window = Application.android.startActivity.getWindow()
-        const windowMgr = android.view.WindowManager
-        window.addFlags(
-          windowMgr.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
-            windowMgr.LayoutParams.FLAG_TURN_SCREEN_ON |
-            windowMgr.LayoutParams.FLAG_KEEP_SCREEN_ON
-        )
-      })
-    }
-
     if (sdkv >= 26) {
-      const importance = priority
-        ? NotifyMgr.IMPORTANCE_HIGH
-        : NotifyMgr.IMPORTANCE_DEFAULT
+      const importance =
+        priority > 0 ? NotifyMgr.IMPORTANCE_HIGH : NotifyMgr.IMPORTANCE_MIN
+      console.log(priority, importance)
       const AudioAttributes = android.media.AudioAttributes
       const audioAttributes = new AudioAttributes.Builder()
-        .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
+        .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
         .setUsage(AudioAttributes.USAGE_ALARM)
         .build()
       const Channel = new android.app.NotificationChannel(
@@ -409,7 +409,8 @@ export class TimerNotification {
 
     // CREATE NOTIFICATION
     const NotificationCompat = androidx.core.app.NotificationCompat
-    let icon = TimerNotification.getResource(ctx, 'ic_stat_notify_silhouette')
+    const AudioManager = android.media.AudioManager
+    let icon = TimerNotif.getIcon(ctx, 'ic_stat_notify_silhouette')
     let builder = new NotificationCompat.Builder(ctx, cID)
       .setColor(new Color('#ff5200').android)
       .setContentIntent(mainPInt)
@@ -418,9 +419,10 @@ export class TimerNotification {
       .setPriority(priority)
       .setShowWhen(actions)
       .setSmallIcon(icon)
-      .setSound(sound ? soundUri : null)
       .setTicker(title)
       .setAutoCancel(false)
+    if (sound) builder.setSound(soundUri, AudioManager.STREAM_ALARM)
+    else builder.setSound(null)
     if (description) builder.setContentText(description)
     if (vibrate) builder.setVibrate([500, 1000])
     if (actions) {
@@ -430,19 +432,20 @@ export class TimerNotification {
       builder.addAction(null, 'Stop', actionPInt2)
     }
     let notification = builder.build()
-    notification.flags = NotificationCompat.FLAG_INSISTENT
+    notification.flags =
+      NotificationCompat.FLAG_INSISTENT | NotificationCompat.FLAG_ONGOING_EVENT
     NotifySrv.notify(nID, notification)
   }
 }
 
 // GET RINGTONES LIST
 export const getTones = () => {
-  let ctx = Utils.ad.getApplicationContext()
-  let tones = []
   const RingtoneManager = android.media.RingtoneManager
+  let ctx = Utils.ad.getApplicationContext()
   const ringtonesMgr = new RingtoneManager(ctx)
   ringtonesMgr.setType(RingtoneManager.TYPE_ALARM)
   const cursor = ringtonesMgr.getCursor()
+  let tones = []
   while (cursor.moveToNext()) {
     tones.push({
       title: cursor.getString(RingtoneManager.TITLE_COLUMN_INDEX),
@@ -452,5 +455,21 @@ export const getTones = () => {
         cursor.getString(RingtoneManager.ID_COLUMN_INDEX),
     })
   }
-  return tones
+
+  let defaultToneUri = RingtoneManager.getActualDefaultRingtoneUri(
+    ctx,
+    RingtoneManager.TYPE_ALARM
+  )
+  let defaultTone
+  if (defaultToneUri) {
+    let uriString = defaultToneUri.toString()
+    let tonesAvailable = tones.filter((e) => e.uri == uriString)
+    let toneExist = tonesAvailable.length
+    defaultTone = {
+      title: toneExist ? tonesAvailable[0].title : tones[0].title,
+      uri: toneExist ? uriString : tones[0].uri,
+    }
+  }
+
+  return { tones, defaultTone: defaultToneUri ? defaultTone : tones[0] }
 }
diff --git a/app/store.ts b/app/store.ts
index b900312d..f27a76bc 100644
--- a/app/store.ts
+++ b/app/store.ts
@@ -387,8 +387,7 @@ export default new Vuex.Store({
         title: sound.title,
         uri: sound.uri,
       }
-      ApplicationSettings.setString('timerSoundTitle', sound.title)
-      ApplicationSettings.setString('timerSoundUri', sound.uri)
+      ApplicationSettings.setString('timerSound', JSON.stringify(sound))
     },
     setTimerVibrate(state, bool) {
       state.timerVibrate = bool
@@ -626,9 +625,7 @@ export default new Vuex.Store({
         )
         if (partition[0].length) createDocuments(partition[0])
         if (partition[1].length) updateDocuments(partition[1])
-      } else {
-        createDocuments(recipes)
-      }
+      } else createDocuments(recipes)
       state.importSummary.found = recipes.length
       state.importSummary.imported = imported
       state.importSummary.updated = updated
diff --git a/package-lock.json b/package-lock.json
index 16de09fc..e86c34aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -98,9 +98,9 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
-      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
+      "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
       "dev": true,
       "dependencies": {
         "@babel/types": "^7.14.2",
@@ -196,15 +196,15 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz",
+      "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==",
       "dev": true,
       "dependencies": {
         "@babel/helper-member-expression-to-functions": "^7.13.12",
         "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "node_modules/@babel/helper-simple-access": {
@@ -259,10 +259,72 @@
         "js-tokens": "^4.0.0"
       }
     },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/parser": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
-      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz",
+      "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -317,131 +379,10 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@nano-sql/core": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
-      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
-      "peer": true,
-      "dependencies": {
-        "fast-deep-equal": "^2.0.1",
-        "levenshtein-edit-distance": "^2.0.4",
-        "really-small-events": "^1.1.0",
-        "snap-db": "^1.1.1"
-      },
-      "bin": {
-        "nsql": "lib/cli.js"
-      },
-      "optionalDependencies": {
-        "chalk": "^2.4.2",
-        "chokidar": "^3.0.2",
-        "command-line-args": "^5.1.1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm": {
-      "version": "0.2.28-1",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
-      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
-      "peer": true,
-      "dependencies": {
-        "@sqltools/formatter": "1.2.2",
-        "app-root-path": "^3.0.0",
-        "buffer": "^5.5.0",
-        "chalk": "^4.1.0",
-        "cli-highlight": "^2.1.4",
-        "debug": "^4.1.1",
-        "dotenv": "^8.2.0",
-        "glob": "^7.1.6",
-        "js-yaml": "^3.14.0",
-        "mkdirp": "^1.0.4",
-        "reflect-metadata": "^0.1.13",
-        "sha.js": "^2.4.11",
-        "tslib": "^1.13.0",
-        "xml2js": "^0.4.23",
-        "yargonaut": "^1.1.2",
-        "yargs": "^16.0.3"
-      },
-      "bin": {
-        "typeorm": "cli.js"
-      },
-      "funding": {
-        "url": "https://opencollective.com/typeorm"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "peer": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "peer": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "peer": true
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@nativescript-community/typeorm/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "peer": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nativescript-community/ui-collectionview": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
-      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg==",
-      "license": "Apache-2.0"
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.31.tgz",
+      "integrity": "sha512-kWtupfe+zr2Vj5hLfie/xxlFYLtLbBS6WrDBUD9z1cJYIZRf9KQxwl8z4wJ2dtQ51dlt1r8CJZgpgRbMTk5xQA=="
     },
     "node_modules/@nativescript/android": {
       "version": "8.0.0",
@@ -450,9 +391,9 @@
       "dev": true
     },
     "node_modules/@nativescript/core": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
-      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.6.tgz",
+      "integrity": "sha512-w9fmuzUrKUblHbkmApMNWExgFZewZCnwf8A2ymcdLsftvljXrDhztbIgQD4aDis61OaqE1N42UToYPpUkaw5pw==",
       "hasInstallScript": true,
       "dependencies": {
         "@nativescript/hook": "~2.0.0",
@@ -461,11 +402,6 @@
         "tslib": "~2.0.0"
       }
     },
-    "node_modules/@nativescript/core/node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-    },
     "node_modules/@nativescript/hook": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@nativescript/hook/-/hook-2.0.0.tgz",
@@ -576,64 +512,6 @@
         }
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/chalk": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@nativescript/webpack/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@nativescript/webpack/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nativescript/webpack/node_modules/sass": {
       "version": "1.32.8",
       "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -649,18 +527,6 @@
         "node": ">=8.9.0"
       }
     },
-    "node_modules/@nativescript/webpack/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz",
@@ -744,26 +610,20 @@
       }
     },
     "node_modules/@polka/url": {
-      "version": "1.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
-      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
       "dev": true
     },
-    "node_modules/@sqltools/formatter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
-      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
-      "peer": true
-    },
     "node_modules/@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
     "node_modules/@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "version": "7.2.11",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.11.tgz",
+      "integrity": "sha512-WYhv//5K8kQtsSc9F1Kn2vHzhYor6KpwPbARH7hwYe3C3ETD0EVx/3P5qQybUoaBEuUa9f/02JjBiXFWalYUmw==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -793,9 +653,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
+      "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -823,6 +683,68 @@
         "prettier": "^1.18.2"
       }
     },
+    "node_modules/@vue/component-compiler-utils/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/chalk/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+      "dev": true
+    },
+    "node_modules/@vue/component-compiler-utils/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
       "version": "7.0.35",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -1176,12 +1098,6 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/ajv/node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
     "node_modules/ansi-colors": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -1207,32 +1123,37 @@
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
       "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "devOptional": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
     },
     "node_modules/anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -1241,45 +1162,11 @@
         "node": ">= 8"
       }
     },
-    "node_modules/app-root-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
-      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
-      "peer": true,
-      "engines": {
-        "node": ">= 6.0.0"
-      }
-    },
     "node_modules/arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "node_modules/argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "peer": true,
-      "dependencies": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "node_modules/argparse/node_modules/sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "peer": true
-    },
-    "node_modules/array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -1400,7 +1287,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -1443,7 +1330,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -1474,30 +1361,6 @@
         "url": "https://opencollective.com/browserslist"
       }
     },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peer": true,
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "node_modules/buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -1535,24 +1398,26 @@
       }
     },
     "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "devOptional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -1582,6 +1447,7 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
       "dependencies": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -1598,74 +1464,11 @@
         "npm": ">=5.0.0"
       }
     },
-    "node_modules/cli-highlight/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/cli-highlight/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-highlight/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -1687,19 +1490,22 @@
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "devOptional": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "devOptional": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/colorette": {
       "version": "1.2.2",
@@ -1707,22 +1513,6 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "node_modules/command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-back": "^3.0.1",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -1996,6 +1786,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -2050,6 +1841,7 @@
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
       "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -2085,15 +1877,16 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.728",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
-      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
+      "version": "1.3.738",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
+      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
       "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
@@ -2182,6 +1975,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true,
       "engines": {
         "node": ">=6"
       }
@@ -2190,6 +1984,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
       "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true,
       "engines": {
         "node": ">=0.8.0"
       }
@@ -2207,19 +2002,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "peer": true,
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -2283,10 +2065,10 @@
       }
     },
     "node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "peer": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.2.5",
@@ -2326,20 +2108,11 @@
         "reusify": "^1.0.4"
       }
     },
-    "node_modules/figlet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
-      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2364,19 +2137,6 @@
         "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
       }
     },
-    "node_modules/find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "array-back": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -2414,64 +2174,6 @@
         "yarn": ">=1.0.0"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -2517,18 +2219,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/fork-ts-checker-webpack-plugin/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/fork-ts-checker-webpack-plugin/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -2565,6 +2255,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "hasInstallScript": true,
       "optional": true,
       "os": [
@@ -2593,6 +2284,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
       "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
@@ -2632,7 +2324,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -2708,34 +2400,13 @@
         "node": ">= 0.4.0"
       }
     },
-    "node_modules/has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/has-ansi/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "devOptional": true,
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/hash-sum": {
@@ -2757,6 +2428,7 @@
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
       "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+      "dev": true,
       "engines": {
         "node": "*"
       }
@@ -2788,26 +2460,6 @@
         "postcss": "^8.1.0"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "peer": true
-    },
     "node_modules/ignore": {
       "version": "5.1.8",
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz",
@@ -2882,7 +2534,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -2906,7 +2558,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2915,6 +2567,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
       "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
       "engines": {
         "node": ">=8"
       }
@@ -2923,7 +2576,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -2935,7 +2588,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.12.0"
       }
@@ -3002,46 +2655,12 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/jest-worker/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "peer": true,
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
     "node_modules/jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -3117,19 +2736,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/levenshtein-edit-distance": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
-      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
-      "peer": true,
-      "bin": {
-        "levenshtein-edit-distance": "cli.js"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
     "node_modules/lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -3177,13 +2783,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "node_modules/lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -3369,12 +2968,14 @@
     "node_modules/ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -3425,7 +3026,6 @@
       "resolved": "https://registry.npmjs.org/nativescript-vue-template-compiler/-/nativescript-vue-template-compiler-2.9.0.tgz",
       "integrity": "sha512-7E8MizLk4PCI/9biTf31o2hLaXcXwQJLmIn4gCU2QHgwRN9NlqkvJ+oGoi7rPBAM8Lqv9CFKq9jH07ZNHXQNbg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "de-indent": "^1.0.2",
         "he": "^1.1.0"
@@ -3447,7 +3047,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "devOptional": true,
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3468,6 +3068,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3567,15 +3168,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/parent-require": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
-      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -3597,12 +3189,14 @@
     "node_modules/parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
     },
     "node_modules/parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
       "dependencies": {
         "parse5": "^6.0.1"
       }
@@ -3610,7 +3204,8 @@
     "node_modules/parse5-htmlparser2-tree-adapter/node_modules/parse5": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
@@ -3639,9 +3234,9 @@
       }
     },
     "node_modules/path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "node_modules/path-type": {
@@ -3654,10 +3249,10 @@
       }
     },
     "node_modules/picomatch": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "devOptional": true,
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true,
       "engines": {
         "node": ">=8.6"
       },
@@ -4045,7 +3640,7 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -4053,12 +3648,6 @@
         "node": ">=8.10.0"
       }
     },
-    "node_modules/really-small-events": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
-      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
-      "peer": true
-    },
     "node_modules/rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -4085,16 +3674,11 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
       "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
     },
-    "node_modules/reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "peer": true
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
       "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4178,12 +3762,13 @@
     "node_modules/safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/sass": {
-      "version": "1.32.13",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
-      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
+      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
       "dev": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -4232,7 +3817,8 @@
     "node_modules/sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "node_modules/schema-utils": {
       "version": "2.7.1",
@@ -4270,19 +3856,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "peer": true,
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      },
-      "bin": {
-        "sha.js": "bin.js"
-      }
-    },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -4341,12 +3914,12 @@
       }
     },
     "node_modules/sirv": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
-      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
       "dev": true,
       "dependencies": {
-        "@polka/url": "^1.0.0-next.9",
+        "@polka/url": "^1.0.0-next.15",
         "mime": "^2.3.1",
         "totalist": "^1.0.0"
       },
@@ -4363,12 +3936,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/snap-db": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
-      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
-      "peer": true
-    },
     "node_modules/source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -4443,6 +4010,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -4456,6 +4024,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
       "dependencies": {
         "ansi-regex": "^5.0.0"
       },
@@ -4473,15 +4042,15 @@
       }
     },
     "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "devOptional": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/tapable": {
@@ -4571,6 +4140,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -4579,6 +4149,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -4599,7 +4170,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
+      "dev": true,
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4645,64 +4216,6 @@
         "webpack": "*"
       }
     },
-    "node_modules/ts-loader/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/ts-loader/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/ts-loader/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-loader/node_modules/lru-cache": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -4730,18 +4243,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/ts-loader/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ts-loader/node_modules/yallist": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -4774,15 +4275,15 @@
       }
     },
     "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "peer": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
     "node_modules/typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
       "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4791,16 +4292,6 @@
         "node": ">=4.2.0"
       }
     },
-    "node_modules/typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -4834,7 +4325,8 @@
     "node_modules/vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
+      "dev": true
     },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
@@ -4944,9 +4436,9 @@
       }
     },
     "node_modules/watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
+      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
       "dev": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -5025,55 +4517,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
@@ -5083,27 +4526,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/webpack-chain": {
       "version": "6.5.1",
       "resolved": "https://registry.npmjs.org/webpack-chain/-/webpack-chain-6.5.1.tgz",
@@ -5277,6 +4699,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -5289,36 +4712,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -5345,28 +4738,6 @@
         }
       }
     },
-    "node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
-      "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "peer": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/xmlbuilder": {
       "version": "9.0.7",
       "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz",
@@ -5387,6 +4758,7 @@
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
       "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5406,76 +4778,11 @@
         "node": ">= 6"
       }
     },
-    "node_modules/yargonaut": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
-      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
-      "peer": true,
-      "dependencies": {
-        "chalk": "^1.1.1",
-        "figlet": "^1.1.1",
-        "parent-require": "^1.0.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/ansi-regex": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/ansi-styles": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/chalk": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-      "peer": true,
-      "dependencies": {
-        "ansi-styles": "^2.2.1",
-        "escape-string-regexp": "^1.0.2",
-        "has-ansi": "^2.0.0",
-        "strip-ansi": "^3.0.0",
-        "supports-color": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/strip-ansi": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-      "peer": true,
-      "dependencies": {
-        "ansi-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/yargonaut/node_modules/supports-color": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-      "peer": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -5493,6 +4800,7 @@
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
       "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true,
       "engines": {
         "node": ">=10"
       }
@@ -5574,9 +4882,9 @@
       }
     },
     "@babel/generator": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.2.tgz",
-      "integrity": "sha512-OnADYbKrffDVai5qcpkMxQ7caomHOoEwjkouqnN2QhydAjowFAZcsdecFIRUBdb+ZcruwYE4ythYmF1UBZU5xQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.14.3.tgz",
+      "integrity": "sha512-bn0S6flG/j0xtQdz3hsjJ624h3W0r3llttBMfyHX3YrZ/KtLYr15bjA0FXkgW7FpvrDuTuElXeVjiKlYRpnOFA==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.14.2",
@@ -5668,15 +4976,15 @@
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.13.12",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
-      "integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.14.3.tgz",
+      "integrity": "sha512-Rlh8qEWZSTfdz+tgNV/N4gz1a0TMNwCUcENhMjHTHKp3LseYH5Jha0NSlyTQWMnjbYcwFt+bqAMqSLHVXkQ6UA==",
       "dev": true,
       "requires": {
         "@babel/helper-member-expression-to-functions": "^7.13.12",
         "@babel/helper-optimise-call-expression": "^7.12.13",
-        "@babel/traverse": "^7.13.0",
-        "@babel/types": "^7.13.12"
+        "@babel/traverse": "^7.14.2",
+        "@babel/types": "^7.14.2"
       }
     },
     "@babel/helper-simple-access": {
@@ -5729,12 +5037,64 @@
         "@babel/helper-validator-identifier": "^7.14.0",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "5.5.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+          "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^3.0.0"
+          }
+        }
       }
     },
     "@babel/parser": {
-      "version": "7.14.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.2.tgz",
-      "integrity": "sha512-IoVDIHpsgE/fu7eXBeRWt8zLbDrSvD7H1gpomOkPpBoEN8KCruCqSDdqo8dddwQQrui30KSvQBaMUOJiuFu6QQ==",
+      "version": "7.14.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.14.3.tgz",
+      "integrity": "sha512-7MpZDIfI7sUC5zWo2+foJ50CSI5lcqDehZ0lVgIhSi4bFEk94fLAKlF3Q0nzSQQ+ca0lm+O6G9ztKVBeu8PMRQ==",
       "dev": true
     },
     "@babel/template": {
@@ -5780,100 +5140,10 @@
       "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==",
       "dev": true
     },
-    "@nano-sql/core": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/@nano-sql/core/-/core-2.3.7.tgz",
-      "integrity": "sha512-B9nniPPRhPf5Hf2cyvy72SNEg4iKQEW6pig9nwrM4DJlmOMZudifOMPBoJuK6JcTaLATIOGRPkclfosNUALnLQ==",
-      "peer": true,
-      "requires": {
-        "chalk": "^2.4.2",
-        "chokidar": "^3.0.2",
-        "command-line-args": "^5.1.1",
-        "fast-deep-equal": "^2.0.1",
-        "levenshtein-edit-distance": "^2.0.4",
-        "really-small-events": "^1.1.0",
-        "snap-db": "^1.1.1"
-      }
-    },
-    "@nativescript-community/typeorm": {
-      "version": "0.2.28-1",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/typeorm/-/typeorm-0.2.28-1.tgz",
-      "integrity": "sha512-2/SlK8c1SR6to6zryysGSKBSczhiXFziccWOU6R00nyjsQj3fJbxLfKDJIZyNefpHvrnpHy3VjWLsXmDXBwCbQ==",
-      "peer": true,
-      "requires": {
-        "@sqltools/formatter": "1.2.2",
-        "app-root-path": "^3.0.0",
-        "buffer": "^5.5.0",
-        "chalk": "^4.1.0",
-        "cli-highlight": "^2.1.4",
-        "debug": "^4.1.1",
-        "dotenv": "^8.2.0",
-        "glob": "^7.1.6",
-        "js-yaml": "^3.14.0",
-        "mkdirp": "^1.0.4",
-        "reflect-metadata": "^0.1.13",
-        "sha.js": "^2.4.11",
-        "tslib": "^1.13.0",
-        "xml2js": "^0.4.23",
-        "yargonaut": "^1.1.2",
-        "yargs": "^16.0.3"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "peer": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "peer": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "peer": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "peer": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "peer": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "@nativescript-community/ui-collectionview": {
-      "version": "4.0.29",
-      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz",
-      "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg=="
+      "version": "4.0.31",
+      "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.31.tgz",
+      "integrity": "sha512-kWtupfe+zr2Vj5hLfie/xxlFYLtLbBS6WrDBUD9z1cJYIZRf9KQxwl8z4wJ2dtQ51dlt1r8CJZgpgRbMTk5xQA=="
     },
     "@nativescript/android": {
       "version": "8.0.0",
@@ -5882,21 +5152,14 @@
       "dev": true
     },
     "@nativescript/core": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.5.tgz",
-      "integrity": "sha512-61u5zo8I5XK6agqrAS2d0JAfOiVJ1kyAMi7VqkyXQohSsjOAK4CAfCAeIvaZf4vd3yeAnUWiL6UvCYt/Ot5srQ==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@nativescript/core/-/core-8.0.6.tgz",
+      "integrity": "sha512-w9fmuzUrKUblHbkmApMNWExgFZewZCnwf8A2ymcdLsftvljXrDhztbIgQD4aDis61OaqE1N42UToYPpUkaw5pw==",
       "requires": {
         "@nativescript/hook": "~2.0.0",
         "css-tree": "^1.1.2",
         "reduce-css-calc": "^2.1.7",
         "tslib": "~2.0.0"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-          "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
-        }
       }
     },
     "@nativescript/hook": {
@@ -5997,46 +5260,6 @@
         "webpack-virtual-modules": "0.4.2"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "sass": {
           "version": "1.32.8",
           "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.8.tgz",
@@ -6045,15 +5268,6 @@
           "requires": {
             "chokidar": ">=2.0.0 <4.0.0"
           }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -6098,26 +5312,20 @@
       }
     },
     "@polka/url": {
-      "version": "1.0.0-next.12",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.12.tgz",
-      "integrity": "sha512-6RglhutqrGFMO1MNUXp95RBuYIuc8wTnMAV5MUhLmjTOy78ncwOw7RgeQ/HeymkKXRhZd0s2DNrM1rL7unk3MQ==",
+      "version": "1.0.0-next.15",
+      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.15.tgz",
+      "integrity": "sha512-15spi3V28QdevleWBNXE4pIls3nFZmBbUGrW9IVPwiQczuSb9n76TCB4bsk8TSel+I1OkHEdPhu5QKMfY6rQHA==",
       "dev": true
     },
-    "@sqltools/formatter": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@sqltools/formatter/-/formatter-1.2.2.tgz",
-      "integrity": "sha512-/5O7Fq6Vnv8L6ucmPjaWbVG1XkP4FO+w5glqfkIsq3Xw4oyNAdJddbnYodNDAfjVUvo/rrSCTom4kAND7T1o5Q==",
-      "peer": true
-    },
     "@triniwiz/nativescript-accelerometer": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz",
       "integrity": "sha512-LKwlNaIWJPEbFKsPwA5vndqrKBUqE9dK9wdi/LsHs0Nl6pfMI7fPkBPoGW7UvVSMqy4s4d35Q0FDbKXR1t796A=="
     },
     "@types/eslint": {
-      "version": "7.2.10",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.10.tgz",
-      "integrity": "sha512-kUEPnMKrqbtpCq/KTaGFFKAcz6Ethm2EjCoKIDaCmfRBWLbFuTcOJfTlorwbnboXBzahqWLgUp1BQeKHiJzPUQ==",
+      "version": "7.2.11",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-7.2.11.tgz",
+      "integrity": "sha512-WYhv//5K8kQtsSc9F1Kn2vHzhYor6KpwPbARH7hwYe3C3ETD0EVx/3P5qQybUoaBEuUa9f/02JjBiXFWalYUmw==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -6147,9 +5355,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.3.0.tgz",
-      "integrity": "sha512-8/bnjSZD86ZfpBsDlCIkNXIvm+h6wi9g7IqL+kmFkQ+Wvu3JrasgLElfiPgoo8V8vVfnEi0QVS12gbl94h9YsQ==",
+      "version": "15.6.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.6.1.tgz",
+      "integrity": "sha512-7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA==",
       "dev": true
     },
     "@types/parse-json": {
@@ -6175,6 +5383,58 @@
         "vue-template-es2015-compiler": "^1.9.0"
       },
       "dependencies": {
+        "ansi-styles": {
+          "version": "3.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+          "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^1.9.0"
+          }
+        },
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          },
+          "dependencies": {
+            "supports-color": {
+              "version": "5.5.0",
+              "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+              "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+              "dev": true,
+              "requires": {
+                "has-flag": "^3.0.0"
+              }
+            }
+          }
+        },
+        "color-convert": {
+          "version": "1.9.3",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+          "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+          "dev": true,
+          "requires": {
+            "color-name": "1.1.3"
+          }
+        },
+        "color-name": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+          "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+          "dev": true
+        },
         "postcss": {
           "version": "7.0.35",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
@@ -6353,8 +5613,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.0.3.tgz",
       "integrity": "sha512-WQs0ep98FXX2XBAfQpRbY0Ma6ADw8JR6xoIkaIiJIzClGOMqVRvPCWqndTxf28DgFopWan0EKtHtg/5W1h0Zkw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@webpack-cli/info": {
       "version": "1.2.4",
@@ -6369,8 +5628,7 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.4.0.tgz",
       "integrity": "sha512-xgT/HqJ+uLWGX+Mzufusl3cgjAcnqYYskaB7o0vRcwOEfuu6hMzSILQpnIzFMGsTaeaX4Nnekl+6fadLbl1/Vg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
@@ -6403,8 +5661,7 @@
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/acorn-private-class-elements/-/acorn-private-class-elements-0.2.7.tgz",
       "integrity": "sha512-+GZH2wOKNZOBI4OOPmzpo4cs6mW297sn6fgIk1dUI08jGjhAaEwvC39mN2gJAg2lmAQJ1rBkFqKWonL3Zz6PVA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-private-methods": {
       "version": "0.3.3",
@@ -6451,22 +5708,13 @@
         "fast-json-stable-stringify": "^2.0.0",
         "json-schema-traverse": "^0.4.1",
         "uri-js": "^4.2.2"
-      },
-      "dependencies": {
-        "fast-deep-equal": {
-          "version": "3.1.3",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-          "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-          "dev": true
-        }
       }
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
       "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ansi-colors": {
       "version": "4.1.1",
@@ -6483,67 +5731,39 @@
     "ansi-regex": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+      "dev": true
     },
     "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "devOptional": true,
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
       "requires": {
-        "color-convert": "^1.9.0"
+        "color-convert": "^2.0.1"
       }
     },
     "any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8="
+      "integrity": "sha1-q8av7tzqUugJzcA3au0845Y10X8=",
+      "dev": true
     },
     "anymatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
       "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
       }
     },
-    "app-root-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-3.0.0.tgz",
-      "integrity": "sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==",
-      "peer": true
-    },
     "arg": {
       "version": "4.1.3",
       "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
       "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA=="
     },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "peer": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      },
-      "dependencies": {
-        "sprintf-js": {
-          "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-          "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-          "peer": true
-        }
-      }
-    },
-    "array-back": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz",
-      "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==",
-      "optional": true,
-      "peer": true
-    },
     "array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6621,7 +5841,7 @@
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
-      "devOptional": true
+      "dev": true
     },
     "bluebird": {
       "version": "3.7.2",
@@ -6658,7 +5878,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "fill-range": "^7.0.1"
       }
@@ -6676,16 +5896,6 @@
         "node-releases": "^1.1.71"
       }
     },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "peer": true,
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
     "buffer-from": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
@@ -6710,21 +5920,20 @@
       "dev": true
     },
     "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "devOptional": true,
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+      "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+      "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
       }
     },
     "chokidar": {
       "version": "3.5.1",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
       "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "anymatch": "~3.1.1",
         "braces": "~3.0.2",
@@ -6746,6 +5955,7 @@
       "version": "2.1.11",
       "resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-2.1.11.tgz",
       "integrity": "sha512-9KDcoEVwyUXrjcJNvHD0NFc/hiwe/WPVYIleQh2O1N2Zro5gWJZ/K+3DGn8w8P/F6FxOgzyC5bxDyHIgCSPhGg==",
+      "dev": true,
       "requires": {
         "chalk": "^4.0.0",
         "highlight.js": "^10.7.1",
@@ -6753,57 +5963,13 @@
         "parse5": "^5.1.1",
         "parse5-htmlparser2-tree-adapter": "^6.0.0",
         "yargs": "^16.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "cliui": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
       "requires": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -6822,19 +5988,19 @@
       }
     },
     "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "devOptional": true,
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
       "requires": {
-        "color-name": "1.1.3"
+        "color-name": "~1.1.4"
       }
     },
     "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-      "devOptional": true
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "colorette": {
       "version": "1.2.2",
@@ -6842,19 +6008,6 @@
       "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
       "dev": true
     },
-    "command-line-args": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz",
-      "integrity": "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-back": "^3.0.1",
-        "find-replace": "^3.0.0",
-        "lodash.camelcase": "^4.3.0",
-        "typical": "^4.0.0"
-      }
-    },
     "commander": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
@@ -7066,6 +6219,7 @@
       "version": "4.3.1",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
       "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -7099,7 +6253,8 @@
     "dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
-      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g=="
+      "integrity": "sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==",
+      "dev": true
     },
     "dotenv-defaults": {
       "version": "2.0.1",
@@ -7126,15 +6281,16 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.728",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.728.tgz",
-      "integrity": "sha512-SHv4ziXruBpb1Nz4aTuqEHBYi/9GNCJMYIJgDEXrp/2V01nFXMNFUTli5Z85f5ivSkioLilQatqBYFB44wNJrA==",
+      "version": "1.3.738",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.738.tgz",
+      "integrity": "sha512-vCMf4gDOpEylPSLPLSwAEsz+R3ShP02Y3cAKMZvTqule3XcPp7tgc/0ESI7IS6ZeyBlGClE50N53fIOkcIVnpw==",
       "dev": true
     },
     "emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "emojis-list": {
       "version": "3.0.0",
@@ -7204,12 +6360,14 @@
     "escalade": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
     },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
     },
     "eslint-scope": {
       "version": "5.1.1",
@@ -7221,12 +6379,6 @@
         "estraverse": "^4.1.1"
       }
     },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "peer": true
-    },
     "esrecurse": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
@@ -7274,10 +6426,10 @@
       }
     },
     "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "peer": true
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "fast-glob": {
       "version": "3.2.5",
@@ -7314,17 +6466,11 @@
         "reusify": "^1.0.4"
       }
     },
-    "figlet": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.0.tgz",
-      "integrity": "sha512-ZQJM4aifMpz6H19AW1VqvZ7l4pOE9p7i/3LyxgO2kp+PO/VcDYNqIHEMtkccqIhTXMKci4kjueJr/iCQEaT/Ww==",
-      "peer": true
-    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
       }
@@ -7340,16 +6486,6 @@
         "pkg-dir": "^4.1.0"
       }
     },
-    "find-replace": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz",
-      "integrity": "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==",
-      "optional": true,
-      "peer": true,
-      "requires": {
-        "array-back": "^3.0.1"
-      }
-    },
     "find-up": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
@@ -7380,46 +6516,6 @@
         "tapable": "^1.0.0"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -7449,15 +6545,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -7493,6 +6580,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
       "optional": true
     },
     "function-bind": {
@@ -7510,7 +6598,8 @@
     "get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
     },
     "get-stream": {
       "version": "6.0.1",
@@ -7535,7 +6624,7 @@
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-glob": "^4.0.1"
       }
@@ -7590,28 +6679,11 @@
         "function-bind": "^1.1.1"
       }
     },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "peer": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "peer": true
-        }
-      }
-    },
     "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "devOptional": true
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true
     },
     "hash-sum": {
       "version": "1.0.2",
@@ -7628,7 +6700,8 @@
     "highlight.js": {
       "version": "10.7.2",
       "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.2.tgz",
-      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg=="
+      "integrity": "sha512-oFLl873u4usRM9K63j4ME9u3etNF0PLiJhSQ8rdfuL51Wn3zkD6drf9ZW0dOzjnZI22YYG24z30JcmfCZjMgYg==",
+      "dev": true
     },
     "html-entities": {
       "version": "1.4.0",
@@ -7646,14 +6719,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "peer": true
+      "dev": true
     },
     "ignore": {
       "version": "5.1.8",
@@ -7711,7 +6777,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "binary-extensions": "^2.0.0"
       }
@@ -7729,18 +6795,19 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "devOptional": true
+      "dev": true
     },
     "is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
     },
     "is-glob": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
       "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-extglob": "^2.1.1"
       }
@@ -7749,7 +6816,7 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "devOptional": true
+      "dev": true
     },
     "is-plain-object": {
       "version": "2.0.4",
@@ -7799,23 +6866,6 @@
         "@types/node": "*",
         "merge-stream": "^2.0.0",
         "supports-color": "^7.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "js-tokens": {
@@ -7824,16 +6874,6 @@
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
     },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "peer": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
     "jsesc": {
       "version": "2.5.2",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -7889,12 +6929,6 @@
       "integrity": "sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==",
       "dev": true
     },
-    "levenshtein-edit-distance": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/levenshtein-edit-distance/-/levenshtein-edit-distance-2.0.5.tgz",
-      "integrity": "sha512-Yuraz7QnMX/JENJU1HA6UtdsbhRzoSFnGpVGVryjQgHtl2s/YmVgmNYkVs5yzVZ9aAvQR9wPBUH3lG755ylxGA==",
-      "peer": true
-    },
     "lines-and-columns": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
@@ -7933,13 +6967,6 @@
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
       "dev": true
     },
-    "lodash.camelcase": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
-      "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
-      "optional": true,
-      "peer": true
-    },
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
@@ -8082,12 +7109,14 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dev": true,
       "requires": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -8153,7 +7182,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "devOptional": true
+      "dev": true
     },
     "npm-run-path": {
       "version": "4.0.1",
@@ -8167,7 +7196,8 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
     },
     "once": {
       "version": "1.4.0",
@@ -8236,12 +7266,6 @@
         "callsites": "^3.0.0"
       }
     },
-    "parent-require": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parent-require/-/parent-require-1.0.0.tgz",
-      "integrity": "sha1-dGoWdjgIOoYLDu9nMssn7UbDKXc=",
-      "peer": true
-    },
     "parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -8257,12 +7281,14 @@
     "parse5": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz",
-      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="
+      "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==",
+      "dev": true
     },
     "parse5-htmlparser2-tree-adapter": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz",
       "integrity": "sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==",
+      "dev": true,
       "requires": {
         "parse5": "^6.0.1"
       },
@@ -8270,7 +7296,8 @@
         "parse5": {
           "version": "6.0.1",
           "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
-          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+          "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+          "dev": true
         }
       }
     },
@@ -8292,9 +7319,9 @@
       "dev": true
     },
     "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "dev": true
     },
     "path-type": {
@@ -8304,10 +7331,10 @@
       "dev": true
     },
     "picomatch": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.3.tgz",
-      "integrity": "sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==",
-      "devOptional": true
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz",
+      "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==",
+      "dev": true
     },
     "pify": {
       "version": "2.3.0",
@@ -8418,8 +7445,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -8575,17 +7601,11 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
       "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "picomatch": "^2.2.1"
       }
     },
-    "really-small-events": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/really-small-events/-/really-small-events-1.1.0.tgz",
-      "integrity": "sha512-iyh4pULyDYBMecekEYcP3ToJD3ZUdIPfZV9nx1C1lJfMguElkDAZvEMJegy8uE7eIROCuLsqh5r44fVro9nKFg==",
-      "peer": true
-    },
     "rechoir": {
       "version": "0.7.0",
       "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.0.tgz",
@@ -8611,16 +7631,11 @@
         }
       }
     },
-    "reflect-metadata": {
-      "version": "0.1.13",
-      "resolved": "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz",
-      "integrity": "sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==",
-      "peer": true
-    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
+      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+      "dev": true
     },
     "resolve": {
       "version": "1.20.0",
@@ -8673,12 +7688,13 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "sass": {
-      "version": "1.32.13",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.32.13.tgz",
-      "integrity": "sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==",
+      "version": "1.34.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.34.0.tgz",
+      "integrity": "sha512-rHEN0BscqjUYuomUEaqq3BMgsXqQfkcMVR7UhscsAVub0/spUrZGBMxQXFS2kfiDsPLZw5yuU9iJEFNC2x38Qw==",
       "dev": true,
       "requires": {
         "chokidar": ">=3.0.0 <4.0.0"
@@ -8697,7 +7713,8 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "schema-utils": {
       "version": "2.7.1",
@@ -8725,16 +7742,6 @@
         "randombytes": "^2.1.0"
       }
     },
-    "sha.js": {
-      "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
-      "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
-      "peer": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
-      }
-    },
     "shallow-clone": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
@@ -8781,12 +7788,12 @@
       }
     },
     "sirv": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.11.tgz",
-      "integrity": "sha512-SR36i3/LSWja7AJNRBz4fF/Xjpn7lQFI30tZ434dIy+bitLYSP+ZEenHg36i23V2SGEz+kqjksg0uOGZ5LPiqg==",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.12.tgz",
+      "integrity": "sha512-+jQoCxndz7L2tqQL4ZyzfDhky0W/4ZJip3XoOuxyQWnAwMxindLl3Xv1qT4x1YX/re0leShvTm8Uk0kQspGhBg==",
       "dev": true,
       "requires": {
-        "@polka/url": "^1.0.0-next.9",
+        "@polka/url": "^1.0.0-next.15",
         "mime": "^2.3.1",
         "totalist": "^1.0.0"
       }
@@ -8797,12 +7804,6 @@
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
-    "snap-db": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/snap-db/-/snap-db-1.1.6.tgz",
-      "integrity": "sha512-KxsO5RnY70J48f6poy0qVm2WS8ZbqG0PUVP2fjd7dvlaCMZ/DxtDv5fhhIVwkP2lOmNQ9QsTFfDuCA7N+TF3qg==",
-      "peer": true
-    },
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -8870,6 +7871,7 @@
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
       "integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
+      "dev": true,
       "requires": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -8880,6 +7882,7 @@
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
       "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+      "dev": true,
       "requires": {
         "ansi-regex": "^5.0.0"
       }
@@ -8891,12 +7894,12 @@
       "dev": true
     },
     "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "devOptional": true,
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
       "requires": {
-        "has-flag": "^3.0.0"
+        "has-flag": "^4.0.0"
       }
     },
     "tapable": {
@@ -8961,6 +7964,7 @@
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "dev": true,
       "requires": {
         "any-promise": "^1.0.0"
       }
@@ -8969,6 +7973,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
+      "dev": true,
       "requires": {
         "thenify": ">= 3.1.0 < 4"
       }
@@ -8983,7 +7988,7 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "devOptional": true,
+      "dev": true,
       "requires": {
         "is-number": "^7.0.0"
       }
@@ -9013,46 +8018,6 @@
         "semver": "^7.3.4"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
         "lru-cache": {
           "version": "6.0.0",
           "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
@@ -9071,15 +8036,6 @@
             "lru-cache": "^6.0.0"
           }
         },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        },
         "yallist": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
@@ -9102,22 +8058,15 @@
       }
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
-      "peer": true
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
+      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ=="
     },
     "typescript": {
       "version": "4.2.4",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.2.4.tgz",
-      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg=="
-    },
-    "typical": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz",
-      "integrity": "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==",
-      "optional": true,
-      "peer": true
+      "integrity": "sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==",
+      "dev": true
     },
     "universalify": {
       "version": "2.0.0",
@@ -9149,7 +8098,8 @@
     "vue": {
       "version": "2.6.12",
       "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz",
-      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="
+      "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==",
+      "dev": true
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
@@ -9233,13 +8183,12 @@
     "vuex": {
       "version": "3.6.2",
       "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz",
-      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==",
-      "requires": {}
+      "integrity": "sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw=="
     },
     "watchpack": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.1.1.tgz",
-      "integrity": "sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==",
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.2.0.tgz",
+      "integrity": "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==",
       "dev": true,
       "requires": {
         "glob-to-regexp": "^0.4.1",
@@ -9323,60 +8272,11 @@
         "ws": "^7.3.1"
       },
       "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-          "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
         "commander": {
           "version": "6.2.1",
           "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
           "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
           "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
         }
       }
     },
@@ -9473,33 +8373,11 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
       "requires": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-        }
       }
     },
     "wrappy": {
@@ -9511,26 +8389,7 @@
       "version": "7.4.5",
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.5.tgz",
       "integrity": "sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==",
-      "dev": true,
-      "requires": {}
-    },
-    "xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
-      "requires": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "dependencies": {
-        "xmlbuilder": {
-          "version": "11.0.1",
-          "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-          "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-          "peer": true
-        }
-      }
+      "dev": true
     },
     "xmlbuilder": {
       "version": "9.0.7",
@@ -9545,7 +8404,8 @@
     "y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA=="
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
     },
     "yallist": {
       "version": "2.1.2",
@@ -9559,63 +8419,11 @@
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
-    "yargonaut": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.4.tgz",
-      "integrity": "sha512-rHgFmbgXAAzl+1nngqOcwEljqHGG9uUZoPjsdZEs1w5JW9RXYzrSvH/u70C1JE5qFi0qjsdhnUX/dJRpWqitSA==",
-      "peer": true,
-      "requires": {
-        "chalk": "^1.1.1",
-        "figlet": "^1.1.1",
-        "parent-require": "^1.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "peer": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "peer": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "peer": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "peer": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "peer": true
-        }
-      }
-    },
     "yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
       "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
+      "dev": true,
       "requires": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -9629,7 +8437,8 @@
     "yargs-parser": {
       "version": "20.2.7",
       "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz",
-      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw=="
+      "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==",
+      "dev": true
     },
     "yn": {
       "version": "3.1.1",
diff --git a/tsconfig.json b/tsconfig.json
index c0ea2af0..d381e021 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
     "lib": ["dom", "es2017"],
     "sourceMap": true,
     "noEmitHelpers": true,
-    "importHelpers": true,
+    "importHelpers": false, // Must be false to create custom android componentt
     "baseUrl": ".",
     "paths": {
       "~/*": ["app/*"],
diff --git a/webpack.config.js b/webpack.config.js
index c31f14bb..bc678552 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,6 +1,20 @@
 const webpack = require('@nativescript/webpack')
+const path = require('path')
 
 module.exports = (env) => {
   webpack.init(env)
+  const platform = webpack.Utils.platform.getPlatformName()
+  webpack.chainWebpack((config) => {
+    if (platform === 'android') {
+      const appComponents = [
+        '@nativescript/core/ui/frame',
+        '@nativescript/core/ui/frame/activity',
+        path.resolve(__dirname, 'app/ForegroundService.js'),
+      ]
+      appComponents.map((component) => {
+        config.entry('bundle').add(component)
+      })
+    }
+  })
   return webpack.resolveConfig()
 }