From 66b5139a12968ac9958820a21c9e57afff4863b6 Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 00:30:58 +0800 Subject: [PATCH 1/6] test --- backend/package-lock.json | 180 ++++++++++++++++++ frontend/src/components/viewer/RoleViewer.vue | 5 +- package-lock.json | 6 - 3 files changed, 183 insertions(+), 8 deletions(-) delete mode 100644 package-lock.json diff --git a/backend/package-lock.json b/backend/package-lock.json index 742f384..9b129c6 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -121,11 +121,93 @@ "lodash.uniq": "^4.5.0" } }, + "node_modules/@firebase/app": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.4.tgz", + "integrity": "sha512-oKd5cT+fDbQ22X8Am3tBOrSFdDp8n4NJDqld4uo+H/PL9F+D3ogtTeiPyDWw1lZK7FsMbmtRrPRozlmJFzSKAQ==", + "peer": true, + "dependencies": { + "@firebase/component": "0.6.7", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.9.6", + "idb": "7.1.1", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat": { + "version": "0.2.34", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.34.tgz", + "integrity": "sha512-enteBla1gBYObauvsC9bRRoqHZnOW48ahYABZ+l+FEiWil1rw0gVihl8D4eLqtQp/ci8+fbOBf3ZL19uFq/OCw==", + "peer": true, + "dependencies": { + "@firebase/app": "0.10.4", + "@firebase/component": "0.6.7", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat/node_modules/@firebase/component": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.7.tgz", + "integrity": "sha512-baH1AA5zxfaz4O8w0vDwETByrKTQqB5CDjRls79Sa4eAGAoERw4Tnung7XbMl3jbJ4B/dmmtsMrdki0KikwDYA==", + "peer": true, + "dependencies": { + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat/node_modules/@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app-compat/node_modules/@firebase/util": { + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.6.tgz", + "integrity": "sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==", + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/@firebase/app-types": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", "integrity": "sha512-6fbHQwDv2jp/v6bXhBw2eSRbNBpxHcd1NBF864UksSMVIqIyri9qpJB1Mn6sGZE+bnDsSQBC5j2TbMxYsJQkQg==" }, + "node_modules/@firebase/app/node_modules/@firebase/component": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.7.tgz", + "integrity": "sha512-baH1AA5zxfaz4O8w0vDwETByrKTQqB5CDjRls79Sa4eAGAoERw4Tnung7XbMl3jbJ4B/dmmtsMrdki0KikwDYA==", + "peer": true, + "dependencies": { + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app/node_modules/@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/@firebase/app/node_modules/@firebase/util": { + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.6.tgz", + "integrity": "sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==", + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/@firebase/auth-interop-types": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/@firebase/auth-interop-types/-/auth-interop-types-0.1.6.tgz", @@ -2391,6 +2473,12 @@ "node": ">=0.10.0" } }, + "node_modules/idb": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", + "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", + "peer": true + }, "node_modules/ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -4701,6 +4789,92 @@ "lodash.uniq": "^4.5.0" } }, + "@firebase/app": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.10.4.tgz", + "integrity": "sha512-oKd5cT+fDbQ22X8Am3tBOrSFdDp8n4NJDqld4uo+H/PL9F+D3ogtTeiPyDWw1lZK7FsMbmtRrPRozlmJFzSKAQ==", + "peer": true, + "requires": { + "@firebase/component": "0.6.7", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.9.6", + "idb": "7.1.1", + "tslib": "^2.1.0" + }, + "dependencies": { + "@firebase/component": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.7.tgz", + "integrity": "sha512-baH1AA5zxfaz4O8w0vDwETByrKTQqB5CDjRls79Sa4eAGAoERw4Tnung7XbMl3jbJ4B/dmmtsMrdki0KikwDYA==", + "peer": true, + "requires": { + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + } + }, + "@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "peer": true, + "requires": { + "tslib": "^2.1.0" + } + }, + "@firebase/util": { + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.6.tgz", + "integrity": "sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==", + "peer": true, + "requires": { + "tslib": "^2.1.0" + } + } + } + }, + "@firebase/app-compat": { + "version": "0.2.34", + "resolved": "https://registry.npmjs.org/@firebase/app-compat/-/app-compat-0.2.34.tgz", + "integrity": "sha512-enteBla1gBYObauvsC9bRRoqHZnOW48ahYABZ+l+FEiWil1rw0gVihl8D4eLqtQp/ci8+fbOBf3ZL19uFq/OCw==", + "peer": true, + "requires": { + "@firebase/app": "0.10.4", + "@firebase/component": "0.6.7", + "@firebase/logger": "0.4.2", + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + }, + "dependencies": { + "@firebase/component": { + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.7.tgz", + "integrity": "sha512-baH1AA5zxfaz4O8w0vDwETByrKTQqB5CDjRls79Sa4eAGAoERw4Tnung7XbMl3jbJ4B/dmmtsMrdki0KikwDYA==", + "peer": true, + "requires": { + "@firebase/util": "1.9.6", + "tslib": "^2.1.0" + } + }, + "@firebase/logger": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", + "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", + "peer": true, + "requires": { + "tslib": "^2.1.0" + } + }, + "@firebase/util": { + "version": "1.9.6", + "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.9.6.tgz", + "integrity": "sha512-IBr1MZbp4d5MjBCXL3TW1dK/PDXX4yOGbiwRNh1oAbE/+ci5Uuvy9KIrsFYY80as1I0iOaD5oOMA9Q8j4TJWcw==", + "peer": true, + "requires": { + "tslib": "^2.1.0" + } + } + } + }, "@firebase/app-types": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/@firebase/app-types/-/app-types-0.7.0.tgz", @@ -6581,6 +6755,12 @@ "safer-buffer": ">= 2.1.2 < 3.0.0" } }, + "idb": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz", + "integrity": "sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==", + "peer": true + }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index de01065..d7da3d6 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -165,8 +165,9 @@ export default class RoleViewer extends Vue { emails: this.emailsWithRoles }) }).then(() => EventBus.$emit('needRoleUpdate', () => { - this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); - this.saving = false; + console.log('debug', this.editedRole.rid); + this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); + this.saving = false; })).catch(err => { this.saving = false; alert(err); diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index 16a2375..0000000 --- a/package-lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "e-notes", - "lockfileVersion": 3, - "requires": true, - "packages": {} -} From c8ef99ec4da92725688fb6e52d9e5e5812ca449c Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 00:36:39 +0800 Subject: [PATCH 2/6] more testing --- frontend/src/components/viewer/RoleViewer.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index d7da3d6..47d9e90 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -165,9 +165,10 @@ export default class RoleViewer extends Vue { emails: this.emailsWithRoles }) }).then(() => EventBus.$emit('needRoleUpdate', () => { - console.log('debug', this.editedRole.rid); - this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); - this.saving = false; + console.log(JSON.stringify(this)); + console.log('debug', this.editedRole.rid); + this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); + this.saving = false; })).catch(err => { this.saving = false; alert(err); From 350e2f9a41177cdca2021823cb19a5f162db6e9e Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 00:46:27 +0800 Subject: [PATCH 3/6] test3 --- frontend/src/components/viewer/RoleViewer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index 47d9e90..4ae745e 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -165,7 +165,7 @@ export default class RoleViewer extends Vue { emails: this.emailsWithRoles }) }).then(() => EventBus.$emit('needRoleUpdate', () => { - console.log(JSON.stringify(this)); + console.log(this); console.log('debug', this.editedRole.rid); this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); this.saving = false; From 2145bc5cee3a72c2baa33c1001c09ec3af4948a2 Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 01:03:41 +0800 Subject: [PATCH 4/6] test4 --- frontend/src/components/viewer/RoleViewer.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index 4ae745e..c594af6 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -164,12 +164,14 @@ export default class RoleViewer extends Vue { action: this.usersPopup.action, emails: this.emailsWithRoles }) - }).then(() => EventBus.$emit('needRoleUpdate', () => { - console.log(this); - console.log('debug', this.editedRole.rid); - this.$router.push({name: 'Role', params: {rid: this.editedRole.rid}}); - this.saving = false; - })).catch(err => { + }).then(() => { + const rid = this.editedRole.rid; + EventBus.$emit('needRoleUpdate', () => { + // this.editedRole is reset in this callback + this.$router.push({name: 'Role', params: {rid: rid}}); + this.saving = false; + }); + }).catch(err => { this.saving = false; alert(err); }); else { From 5df3c049f435077dfa27ab25a07bb367e0c35f9d Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 01:15:34 +0800 Subject: [PATCH 5/6] add text for no users --- frontend/src/components/viewer/RoleViewer.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index c594af6..ad5661c 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -34,8 +34,9 @@
- +
From 07c0b68d44ed46353ef3bf0c69cfb1f89375a408 Mon Sep 17 00:00:00 2001 From: squiddy Date: Mon, 27 May 2024 01:20:07 +0800 Subject: [PATCH 6/6] also don't show the toggle plain button --- frontend/src/components/viewer/RoleViewer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/viewer/RoleViewer.vue b/frontend/src/components/viewer/RoleViewer.vue index ad5661c..6393449 100644 --- a/frontend/src/components/viewer/RoleViewer.vue +++ b/frontend/src/components/viewer/RoleViewer.vue @@ -47,7 +47,7 @@

Pending


             

-            Toggle Plain
+            Toggle Plain