Compare commits

...

10 Commits

Author SHA1 Message Date
wh1te909
72cdeeaa6a Release 0.101.5 2022-10-25 22:02:34 +00:00
wh1te909
d37122386f bump version 2022-10-25 22:02:23 +00:00
wh1te909
17d960fca9 update reqs 2022-10-25 06:36:07 +00:00
wh1te909
d2e0b8ad9b fix function call 2022-10-23 08:04:32 +00:00
wh1te909
1eca4d605b Release 0.101.3 2022-10-19 22:35:54 +00:00
wh1te909
776c27ec26 bump version 2022-10-19 22:33:09 +00:00
wh1te909
41c61ce152 update reqs 2022-10-19 06:50:50 +00:00
wh1te909
8e9de8b6b6 check if token expired 2022-10-19 06:47:16 +00:00
wh1te909
4cf5f7a3cb update reqs 2022-10-18 00:20:02 +00:00
wh1te909
9729492d1c make link readable in dark mode amidaware/tacticalrmm#1314 2022-10-14 02:06:15 +00:00
8 changed files with 470 additions and 446 deletions

853
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "web",
"version": "0.101.0",
"version": "0.101.5",
"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",
"vue": "3.2.39",
"quasar": "2.10.0",
"vue": "3.2.41",
"vue3-ace-editor": "2.2.2",
"vue3-apexcharts": "1.4.1",
"vuedraggable": "4.1.0",
"vue-router": "4.1.5",
"vuex": "4.0.2"
"vue-router": "4.1.6",
"vuex": "4.1.0"
},
"devDependencies": {
"@quasar/cli": "^1.3.2",
"@intlify/vite-plugin-vue-i18n": "^6.0.1",
"@quasar/app-vite": "^1.1.2",
"@types/node": "^18.7.18",
"@typescript-eslint/eslint-plugin": "^5.38.0",
"@typescript-eslint/parser": "^5.38.0",
"autoprefixer": "^10.4.11",
"eslint": "^8.21.0",
"@intlify/vite-plugin-vue-i18n": "^6.0.3",
"@quasar/app-vite": "^1.1.3",
"@types/node": "^18.11.5",
"@typescript-eslint/eslint-plugin": "^5.41.0",
"@typescript-eslint/parser": "^5.41.0",
"autoprefixer": "^10.4.12",
"eslint": "^8.26.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"
}
}

View File

@@ -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({

View File

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

View File

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

View File

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

View File

@@ -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,

View File

@@ -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);