update reqs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "web",
-  "version": "0.100.10-dev",
+  "version": "0.101.6-dev",
   "private": true,
   "productName": "Tactical RMM",
   "scripts": {
@@ -10,31 +10,31 @@
     "format": "prettier --write \"**/*.{js,ts,vue,,html,md,json}\" --ignore-path .gitignore"
   },
   "dependencies": {
-    "@quasar/extras": "1.15.3",
+    "@quasar/extras": "1.15.5",
     "apexcharts": "3.35.5",
     "axios": "0.27.2",
-    "dotenv": "16.0.2",
+    "dotenv": "16.0.3",
     "qrcode.vue": "3.3.3",
-    "quasar": "2.8.4",
+    "quasar": "2.10.1",
-    "vue": "3.2.39",
+    "vue": "3.2.41",
     "vue3-ace-editor": "2.2.2",
     "vue3-apexcharts": "1.4.1",
     "vuedraggable": "4.1.0",
-    "vue-router": "4.1.5",
+    "vue-router": "4.1.6",
-    "vuex": "4.0.2"
+    "vuex": "4.1.0"
   },
   "devDependencies": {
     "@quasar/cli": "^1.3.2",
-    "@intlify/vite-plugin-vue-i18n": "^6.0.1",
+    "@intlify/vite-plugin-vue-i18n": "^6.0.3",
-    "@quasar/app-vite": "^1.1.2",
+    "@quasar/app-vite": "^1.1.3",
-    "@types/node": "^18.7.18",
+    "@types/node": "^18.11.9",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@typescript-eslint/parser": "^5.42.1",
-    "autoprefixer": "^10.4.11",
+    "autoprefixer": "^10.4.12",
-    "eslint": "^8.21.0",
+    "eslint": "^8.27.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-vue": "^8.5.0",
     "prettier": "^2.7.1",
-    "typescript": "^4.8.3"
+    "typescript": "^4.8.4"
   }
 }

src/components/agents/WinUpdateTab.vue

@@ -310,9 +310,10 @@ export default {
     }
 
     function showUpdateDetails(update) {
+      const color = $q.dark.isActive ? "white" : "";
       let support_urls = "";
       update.more_info_urls.forEach((u) => {
-        support_urls += `<a href='${u}' target='_blank'>${u}</a><br/>`;
+        support_urls += `<a style='color: ${color}' href='${u}' target='_blank'>${u}</a><br/>`;
       });
       let cats = update.categories.join(", ");
       $q.dialog({

src/components/core/APIKeysTable.vue

@@ -208,7 +208,7 @@ export default {
     }
 
     // component lifecycle hooks
-    onMounted(getAPIKeys());
+    onMounted(getAPIKeys);
     return {
       // reactive data
       keys,

src/components/modals/agents/AgentDownload.vue

@@ -10,10 +10,13 @@
       </q-card-actions>
     </q-card-section>
     <q-card-section>
-      <p class="text-subtitle1">
+      <p v-if="info.plat === 'windows'" class="text-subtitle1">
         Download the agent then run the following command from an elevated
         command prompt on the device you want to add.
       </p>
+      <p v-else-if="info.plat === 'darwin'" class="text-subtitle1">
+        Run the following command from a terminal
+      </p>
       <p>
         <q-field outlined :color="$q.dark.isActive ? 'white' : 'black'">
           <code>{{ info.data.cmd }}</code>
@@ -86,12 +89,12 @@
       <p class="text-italic">
         Note: the auth token above will be valid for {{ info.expires }} hours.
       </p>
-      <q-btn
+      <q-btn v-if="info.plat === 'windows'"
         type="a"
         :href="info.data.url"
         color="primary"
         label="Download Agent"
-      />
+      ></q-btn>
     </q-card-section>
   </q-card>
 </template>

src/components/scripts/ScriptManager.vue

@@ -867,7 +867,7 @@ export default {
     }
 
     // component life cycle hooks
-    onMounted(getScripts());
+    onMounted(getScripts);
 
     return {
       // reactive data

src/composables/accounts.js

@@ -31,7 +31,7 @@ export function useUserDropdown(onMount = false) {
   }
 
   if (onMount) {
-    onMounted(getUserOptions());
+    onMounted(getUserOptions);
   }
 
   return {

src/layouts/MainLayout.vue

@@ -14,6 +14,22 @@
           @click="$store.dispatch('reload')"
         />
       </q-banner>
+      <q-banner
+        v-if="!hosted && tokenExpired"
+        inline-actions
+        class="bg-yellow text-black text-center"
+      >
+      <q-icon size="xl" name="warning" />
+        <span><br />Your code signing token is no longer valid.<br/><br/>
+        If you have downgraded or cancelled your sponsorship, please delete your token from the Code Signing modal and refresh to get rid of this banner.<br/><br/>
+        For any issues or to renew your sponsorship please email support@amidaware.com<br/><br/></span>
+        <q-btn
+          color="dark"
+          icon="refresh"
+          label="Refresh"
+          @click="$store.dispatch('reload')"
+        />
+      </q-banner>
       <q-toolbar>
         <q-btn
           dense
@@ -167,6 +183,7 @@ export default {
     const needRefresh = computed(() => store.state.needrefresh);
     const user = computed(() => store.state.username);
     const hosted = computed(() => store.state.hosted);
+    const tokenExpired = computed(() => store.state.tokenExpired);
 
     const latestReleaseURL = computed(() => {
       return latestTRMMVersion.value
@@ -259,6 +276,8 @@ export default {
       user,
       needRefresh,
       darkMode,
+      hosted,
+      tokenExpired,
 
       // methods
       showUserPreferences,

src/store/index.js

@@ -17,6 +17,7 @@ export default function () {
         agentPlatform: "windows",
         agentTableLoading: false,
         needrefresh: false,
+        tokenExpired: false,
         refreshSummaryTab: false,
         tableHeight: "300px",
         tabHeight: "300px",
@@ -83,6 +84,9 @@ export default function () {
       SET_REFRESH_NEEDED(state, action) {
         state.needrefresh = action;
       },
+      SET_TOKEN_EXPIRED(state, action) {
+        state.tokenExpired = action;
+      },
       SET_SPLITTER(state, val) {
         // top toolbar is 50px. Filebar is 40px and agent filter tabs are 44px
         state.tableHeight = `${Screen.height - 50 - 40 - 78 - val}px`;
@@ -212,6 +216,7 @@ export default function () {
         context.commit("SET_URL_ACTION", data.url_action);
         context.commit("setShowCommunityScripts", data.show_community_scripts);
         context.commit("SET_HOSTED", data.hosted);
+        context.commit("SET_TOKEN_EXPIRED", data.token_is_expired);
 
         if (data.date_format && data.date_format !== "")
           context.commit("setDateFormat", data.date_format);