Skip to content

Commit 47acfcc

Browse files
megastarymegastary
committed
Online services
1 parent 4dba04b commit 47acfcc

File tree

7 files changed

+48
-35
lines changed

7 files changed

+48
-35
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lazy-admin",
3-
"version": "0.4.9",
3+
"version": "0.5.0",
44
"description": "GUI for PowerShell scripts to simplify day to day IT tasks.",
55
"productName": "Lazy Admin",
66
"cordovaId": "eu.houby-studio.lazy-admin",
@@ -13,7 +13,7 @@
1313
"release": "quasar build --mode electron --publish onTagOrDraft"
1414
},
1515
"dependencies": {
16-
"@quasar/extras": "^1.9.4",
16+
"@quasar/extras": "^1.9.5",
1717
"axios": "^0.19.2",
1818
"csv": "^5.3.2",
1919
"electron-log": "^4.1.1",

‎src/components/CommandDialog.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ export default {
224224
return this.getLoggedinServices
225225
},
226226
set (val) {
227-
this.$store.dispatch('lazystore/setLoggedinServices', val)
227+
this.$store.dispatch('lazystore/addLoggedinServices', val)
228228
}
229229
},
230230
localValue: {

‎src/pages/LoginPage.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,8 @@ export default {
267267
this.login = throttle(this.login, 800)
268268
this.skipLogin = throttle(this.skipLogin, 800)
269269
console.log(`Application started by user ${this.$q.electron.remote.process.env.USERDOMAIN}\\${this.$q.electron.remote.process.env.USERNAME} on computer ${this.$q.electron.remote.process.env.COMPUTERNAME}`)
270+
// Delete logged in services
271+
this.$store.dispatch('lazystore/clearLoggedinServices')
270272
// Try to load saved credentials from Credential Manager
271273
this.$pwsh.shell.addCommand(GetSavedCredentials)
272274
setTimeout(() => {

‎src/pages/ScriptsPage.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,8 @@ export default {
199199
})
200200
// Stop listening to output, hide progress dialog and reset dialog
201201
this.stopProgress()
202+
// Delete logged in services
203+
this.$store.dispatch('lazystore/clearLoggedinServices')
202204
// Kill current powershell proccess
203205
childProcess.exec(`taskkill /f /pid ${this.$pwsh.shell.pid}`, (error, stdout, stderr) => {
204206
if (error) {

‎src/store/lazystore/actions.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,12 @@ export async function setDisplayProgress ({ commit }, showProgress) {
123123
commit('SET_DISPLAYPROGRESS', showProgress)
124124
}
125125

126-
// Commit mutation to set object of logged in services - Accessed in ScriptsPage.vue
127-
export async function setLoggedinServices ({ commit }, loggedInServices) {
128-
commit('SET_LOGGEDINSERVICES', loggedInServices)
126+
// Commit mutation to add object to logged in services - Accessed in ScriptsPage.vue
127+
export async function addLoggedinServices ({ commit }, loggedInServices) {
128+
commit('ADD_LOGGEDINSERVICES', loggedInServices)
129+
}
130+
131+
// Commit mutation to clear logged in services - Accessed in ScriptsPage.vue
132+
export async function clearLoggedinServices ({ commit }) {
133+
commit('CLEAR_LOGGEDINSERVICES', {})
129134
}

‎src/store/lazystore/mutations.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ export const SET_DISPLAYPROGRESS = (state, value) => {
9292
state.display_progress = value
9393
}
9494

95-
export const SET_LOGGEDINSERVICES = (state, value) => {
95+
export const ADD_LOGGEDINSERVICES = (state, value) => {
96+
state.loggedin_services = Object.assign({}, state.loggedin_services, value)
97+
}
98+
99+
export const CLEAR_LOGGEDINSERVICES = (state, value) => {
96100
state.loggedin_services = value
97101
}

‎yarn.lock

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -852,9 +852,9 @@
852852
semver "^5.5.0"
853853

854854
"@babel/preset-modules@^0.1.3":
855-
version "0.1.3"
856-
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz#13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"
857-
integrity sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==
855+
version "0.1.4"
856+
resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
857+
integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
858858
dependencies:
859859
"@babel/helper-plugin-utils" "^7.0.0"
860860
"@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
@@ -1115,10 +1115,10 @@
11151115
babel-plugin-dynamic-import-node "^2.3.0"
11161116
babel-plugin-module-resolver "^4.0.0"
11171117

1118-
"@quasar/extras@^1.9.4":
1119-
version "1.9.4"
1120-
resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.9.4.tgz#2978e45dc8cb2802172c6cddafe383b55cd46037"
1121-
integrity sha512-g0a39r4ejpTBsrygSfvc1gcZEhnGMl0Rj/xSH6kvmn42NtAwkKiORqFckhhHJ3ZsubE1c5F2jAFcpWAaaC/t8A==
1118+
"@quasar/extras@^1.9.5":
1119+
version "1.9.5"
1120+
resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.9.5.tgz#266663cb728d71706038fa7eaaa7e6a2c97218f7"
1121+
integrity sha512-eUJrYw51qWtJfw12Ha2VBK8wBqkperHh8iaktQoMUrda4goUZ8nYpbfq/ZQdmsDiBku/kpUIrr0pPRmjzVJwkQ==
11221122

11231123
"@quasar/[email protected]":
11241124
version "1.1.4"
@@ -1307,9 +1307,9 @@
13071307
integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
13081308

13091309
"@types/node@*":
1310-
version "14.6.0"
1311-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.0.tgz#7d4411bf5157339337d7cff864d9ff45f177b499"
1312-
integrity sha512-mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA==
1310+
version "14.6.1"
1311+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.6.1.tgz#fdf6f6c6c73d3d8eee9c98a9a0485bc524b048d7"
1312+
integrity sha512-HnYlg/BRF8uC1FyKRFZwRaCPTPYKa+6I8QiUZFLredaGOou481cgFS4wKRFyKvQtX8xudqkSdBczJHIYSQYKrQ==
13131313

13141314
"@types/node@^12.0.12":
13151315
version "12.12.54"
@@ -2222,9 +2222,9 @@ bindings@^1.5.0:
22222222
file-uri-to-path "1.0.0"
22232223

22242224
bl@^4.0.1:
2225-
version "4.0.2"
2226-
resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"
2227-
integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==
2225+
version "4.0.3"
2226+
resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
2227+
integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
22282228
dependencies:
22292229
buffer "^5.5.0"
22302230
inherits "^2.0.4"
@@ -2649,9 +2649,9 @@ caniuse-api@^3.0.0:
26492649
lodash.uniq "^4.5.0"
26502650

26512651
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001061, caniuse-lite@^1.0.30001111:
2652-
version "1.0.30001117"
2653-
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001117.tgz#69a9fae5d480eaa9589f7641a83842ad396d17c4"
2654-
integrity sha512-4tY0Fatzdx59kYjQs+bNxUwZB03ZEBgVmJ1UkFPz/Q8OLiUUbjct2EdpnXj0fvFTPej2EkbPIG0w8BWsjAyk1Q==
2652+
version "1.0.30001119"
2653+
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001119.tgz#99185d04bc00e76a86c9ff731dc5ec8e53aefca1"
2654+
integrity sha512-Hpwa4obv7EGP+TjkCh/wVvbtNJewxmtg4yVJBLFnxo35vbPapBr138bUWENkb5j5L9JZJ9RXLn4OrXRG/cecPQ==
26552655

26562656
caseless@~0.12.0:
26572657
version "0.12.0"
@@ -4042,9 +4042,9 @@ [email protected]:
40424042
mime "^2.4.6"
40434043

40444044
electron-to-chromium@^1.3.523:
4045-
version "1.3.545"
4046-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.545.tgz#d9add694c78554b8c00bc6e6fc929d5ccd7d1b99"
4047-
integrity sha512-+0R/i17u5E1cwF3g0W8Niq3UUKTUMyyT4kLkutZUHG8mDNvFsAckK3HIanzGVtixe3b6rknD8k7gHiR6nKFkgg==
4045+
version "1.3.554"
4046+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.554.tgz#11d0619b927a25f300b787ad7ee1ece91384dde9"
4047+
integrity sha512-Vtz2dVH5nMtKK4brahmgScwFS8PBnpA4VObYXtlsqN8ZpT9IFelv0Rpflc1+NIILjGVaj6vEiXQbhrs3Pl8O7g==
40484048

40494049
electron-updater@^4.3.1:
40504050
version "4.3.4"
@@ -4429,9 +4429,9 @@ etag@~1.8.1:
44294429
integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
44304430

44314431
eventemitter3@^4.0.0:
4432-
version "4.0.6"
4433-
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.6.tgz#1258f6fa51b4908aadc2cd624fcd6e64f99f49d6"
4434-
integrity sha512-s3GJL04SQoM+gn2c14oyqxvZ3Pcq7cduSDqy3sBFXx6UPSUmgVYwQM9zwkTn9je0lrfg0gHEwR42pF3Q2dCQkQ==
4432+
version "4.0.7"
4433+
resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
4434+
integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
44354435

44364436
events@^3.0.0:
44374437
version "3.2.0"
@@ -6604,9 +6604,9 @@ [email protected]:
66046604
wrap-ansi "^6.2.0"
66056605

66066606
loglevel@^1.6.8:
6607-
version "1.6.8"
6608-
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.8.tgz#8a25fb75d092230ecd4457270d80b54e28011171"
6609-
integrity sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==
6607+
version "1.7.0"
6608+
resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz#728166855a740d59d38db01cf46f042caa041bb0"
6609+
integrity sha512-i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ==
66106610

66116611
loose-envify@^1.0.0:
66126612
version "1.4.0"
@@ -9772,9 +9772,9 @@ supports-color@^6.1.0:
97729772
has-flag "^3.0.0"
97739773

97749774
supports-color@^7.0.0, supports-color@^7.1.0:
9775-
version "7.1.0"
9776-
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
9777-
integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
9775+
version "7.2.0"
9776+
resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
9777+
integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
97789778
dependencies:
97799779
has-flag "^4.0.0"
97809780

0 commit comments

Comments
 (0)