From 6ef50978d51a2d9caa8edb5f9b0e2622b6cfdf27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 26 Oct 2021 07:56:57 +0200 Subject: [PATCH] fixes --- public/mix-manifest.json | 75 +++++++++++++++++-- .../js/components/FilesView/MemberAvatar.vue | 19 ++++- .../components/Teams/Components/TeamList.vue | 20 +++-- .../Teams/Components/TeamMembersPreview.vue | 2 +- .../components/Teams/EditTeamFolderPopup.vue | 2 +- resources/js/helpers/functionHelpers.js | 1 + resources/js/store/modules/app.js | 1 - src/Domain/Folders/Models/Folder.php | 3 +- 8 files changed, 102 insertions(+), 21 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 24c764f7..49049fba 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -9,7 +9,7 @@ "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=1d731f1c4a9daecb2a99", "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js?id=5841d65172536a8a9bdc", "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=a99755060794dbdfba72", - "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=0531e207d92e693af64c", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=0babe59e69f432ce0d03", "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=575db2908a16fbd98d57", "/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=90270d0c5aeb5c50dacf", "/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=2ceec639f8de0a9a9966", @@ -40,7 +40,7 @@ "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=0ad2dbd9eb72a8b36f74", "/chunks/files.js": "/chunks/files.js?id=cb2f07a2633f91271ce8", "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared-with-me~chun~fd99312c.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared-with-me~chun~fd99312c.js?id=e773634545b09ffbf57c", - "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=2395d6a7b949e026a513", + "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.js?id=cf9cce8cf9eb399331b3", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f3cd1a63.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/settings-subscription~chunks/shared~f3cd1a63.js?id=25b3c7f6a6a58a29ab17", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~34b5eb22.js?id=9a0be77860d4cc40f11c", "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js": "/chunks/files~chunks/my-shared-items~chunks/recent-uploads~chunks/shared-with-me~chunks/shared/files~~bf3ddedc.js?id=388926106039c69c8cf8", @@ -59,7 +59,7 @@ "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=4b3d3d91faa908b876ac", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=b5017d712135057283c9", "/chunks/plans.js": "/chunks/plans.js?id=7c1b78c2301824c517ed", - "/chunks/platform.js": "/chunks/platform.js?id=fd8137852ab76f875886", + "/chunks/platform.js": "/chunks/platform.js?id=984941e8fbad48c84c31", "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=6eab13949e690d85a716", "/chunks/profile.js": "/chunks/profile.js?id=0638997b77c6f1246062", "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=58edfb3a35062e1ba4e0", @@ -107,7 +107,7 @@ "/chunks/shared/authenticate.2749e9dbf6bd51af84a0.hot-update.js": "/chunks/shared/authenticate.2749e9dbf6bd51af84a0.hot-update.js", "/js/main.186de383ff7311cb957b.hot-update.js": "/js/main.186de383ff7311cb957b.hot-update.js", "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~c4d54e6f.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~c4d54e6f.js?id=b74632b568edd10e92ec", - "/chunks/invitation.js": "/chunks/invitation.js?id=7022a8d4477b02aad3c8", + "/chunks/invitation.js": "/chunks/invitation.js?id=8712b2b2c734e2cb8788", "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8", "/chunks/invitation.bb4eb7e511cc031b7d71.hot-update.js": "/chunks/invitation.bb4eb7e511cc031b7d71.hot-update.js", "/chunks/invitation.d6aa1a9c8c8323860725.hot-update.js": "/chunks/invitation.d6aa1a9c8c8323860725.hot-update.js", @@ -690,5 +690,70 @@ "/chunks/platform~chunks/shared.0454f99a43967923eb3c.hot-update.js": "/chunks/platform~chunks/shared.0454f99a43967923eb3c.hot-update.js", "/chunks/platform~chunks/shared.dffbe84f22d1bbbac981.hot-update.js": "/chunks/platform~chunks/shared.dffbe84f22d1bbbac981.hot-update.js", "/chunks/platform~chunks/shared.9e2fd3db95253a09c0bd.hot-update.js": "/chunks/platform~chunks/shared.9e2fd3db95253a09c0bd.hot-update.js", - "/chunks/platform~chunks/shared.f74d74a8e36565622615.hot-update.js": "/chunks/platform~chunks/shared.f74d74a8e36565622615.hot-update.js" + "/chunks/platform~chunks/shared.f74d74a8e36565622615.hot-update.js": "/chunks/platform~chunks/shared.f74d74a8e36565622615.hot-update.js", + "/chunks/platform.0ff303e8af5292592306.hot-update.js": "/chunks/platform.0ff303e8af5292592306.hot-update.js", + "/chunks/platform.768ae957b722953c9ffc.hot-update.js": "/chunks/platform.768ae957b722953c9ffc.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c010e1754e52b8f6861a.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c010e1754e52b8f6861a.hot-update.js", + "/chunks/invitation.c010e1754e52b8f6861a.hot-update.js": "/chunks/invitation.c010e1754e52b8f6861a.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.467cc9a950454fc0372d.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.467cc9a950454fc0372d.hot-update.js", + "/chunks/invitation.467cc9a950454fc0372d.hot-update.js": "/chunks/invitation.467cc9a950454fc0372d.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.b72da2bc4c32076b3783.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.b72da2bc4c32076b3783.hot-update.js", + "/chunks/invitation.b72da2bc4c32076b3783.hot-update.js": "/chunks/invitation.b72da2bc4c32076b3783.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.047d310e2287bf89035c.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.047d310e2287bf89035c.hot-update.js", + "/chunks/invitation.047d310e2287bf89035c.hot-update.js": "/chunks/invitation.047d310e2287bf89035c.hot-update.js", + "/chunks/platform.71dbf132bc5441b58a32.hot-update.js": "/chunks/platform.71dbf132bc5441b58a32.hot-update.js", + "/chunks/platform.e9b31574a6de18585d0c.hot-update.js": "/chunks/platform.e9b31574a6de18585d0c.hot-update.js", + "/chunks/platform.6088c5b09c717182b85b.hot-update.js": "/chunks/platform.6088c5b09c717182b85b.hot-update.js", + "/chunks/platform.32e8a20c6cda561ce115.hot-update.js": "/chunks/platform.32e8a20c6cda561ce115.hot-update.js", + "/chunks/platform.de7f69d5617ab4a79680.hot-update.js": "/chunks/platform.de7f69d5617ab4a79680.hot-update.js", + "/chunks/platform.1031cbeee2fb78c63cc7.hot-update.js": "/chunks/platform.1031cbeee2fb78c63cc7.hot-update.js", + "/chunks/platform.5ef16c795b00e438a335.hot-update.js": "/chunks/platform.5ef16c795b00e438a335.hot-update.js", + "/chunks/platform.cfe614bb2bb9416a6802.hot-update.js": "/chunks/platform.cfe614bb2bb9416a6802.hot-update.js", + "/chunks/platform.4263ce4795e062a82201.hot-update.js": "/chunks/platform.4263ce4795e062a82201.hot-update.js", + "/chunks/platform.1e82e5183c5e048e0119.hot-update.js": "/chunks/platform.1e82e5183c5e048e0119.hot-update.js", + "/chunks/platform.8abd1bd479defd2fe21e.hot-update.js": "/chunks/platform.8abd1bd479defd2fe21e.hot-update.js", + "/js/main.9963268745dc115f78b5.hot-update.js": "/js/main.9963268745dc115f78b5.hot-update.js", + "/chunks/platform.fff622bbccf9c090948d.hot-update.js": "/chunks/platform.fff622bbccf9c090948d.hot-update.js", + "/chunks/platform.5e8b2e65a442d12541fb.hot-update.js": "/chunks/platform.5e8b2e65a442d12541fb.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.7cb40915f9e6646a77f6.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.7cb40915f9e6646a77f6.hot-update.js", + "/chunks/invitation.7cb40915f9e6646a77f6.hot-update.js": "/chunks/invitation.7cb40915f9e6646a77f6.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c9a0f50e7d8f7c8dbbc5.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c9a0f50e7d8f7c8dbbc5.hot-update.js", + "/chunks/invitation.c9a0f50e7d8f7c8dbbc5.hot-update.js": "/chunks/invitation.c9a0f50e7d8f7c8dbbc5.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.80b03200d4da633ad024.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.80b03200d4da633ad024.hot-update.js", + "/chunks/invitation.80b03200d4da633ad024.hot-update.js": "/chunks/invitation.80b03200d4da633ad024.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.591446e671c8a051844e.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.591446e671c8a051844e.hot-update.js", + "/chunks/invitation.591446e671c8a051844e.hot-update.js": "/chunks/invitation.591446e671c8a051844e.hot-update.js", + "/chunks/platform.1d8220e312c4558e0972.hot-update.js": "/chunks/platform.1d8220e312c4558e0972.hot-update.js", + "/chunks/platform.6944dc98cfbeb3c105cc.hot-update.js": "/chunks/platform.6944dc98cfbeb3c105cc.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.15d22aba16f24b3bb6f8.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.15d22aba16f24b3bb6f8.hot-update.js", + "/chunks/invitation.15d22aba16f24b3bb6f8.hot-update.js": "/chunks/invitation.15d22aba16f24b3bb6f8.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.0a1be5786d9594d1f1fe.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.0a1be5786d9594d1f1fe.hot-update.js", + "/chunks/invitation.0a1be5786d9594d1f1fe.hot-update.js": "/chunks/invitation.0a1be5786d9594d1f1fe.hot-update.js", + "/chunks/platform.dc828fdc357966edf7fe.hot-update.js": "/chunks/platform.dc828fdc357966edf7fe.hot-update.js", + "/chunks/platform.7aac92d121eb7af6126e.hot-update.js": "/chunks/platform.7aac92d121eb7af6126e.hot-update.js", + "/chunks/platform.b2cd09d1b0d4d3838b3f.hot-update.js": "/chunks/platform.b2cd09d1b0d4d3838b3f.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.a8b309ab92a4f5b5ebc2.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.a8b309ab92a4f5b5ebc2.hot-update.js", + "/chunks/invitation.a8b309ab92a4f5b5ebc2.hot-update.js": "/chunks/invitation.a8b309ab92a4f5b5ebc2.hot-update.js", + "/chunks/platform.50c941de463c10ac3542.hot-update.js": "/chunks/platform.50c941de463c10ac3542.hot-update.js", + "/chunks/platform.66bcc7b252ded2a4b139.hot-update.js": "/chunks/platform.66bcc7b252ded2a4b139.hot-update.js", + "/js/main.33728e40c494921d48ed.hot-update.js": "/js/main.33728e40c494921d48ed.hot-update.js", + "/chunks/platform.099635c7d57a531eb313.hot-update.js": "/chunks/platform.099635c7d57a531eb313.hot-update.js", + "/chunks/platform.2f9035723582b2dc20a9.hot-update.js": "/chunks/platform.2f9035723582b2dc20a9.hot-update.js", + "/js/main.9053293015e7e1420b39.hot-update.js": "/js/main.9053293015e7e1420b39.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.622d5504ff0d0ad930a9.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.622d5504ff0d0ad930a9.hot-update.js", + "/chunks/invitation.622d5504ff0d0ad930a9.hot-update.js": "/chunks/invitation.622d5504ff0d0ad930a9.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.444a53b6737bffb1b1da.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.444a53b6737bffb1b1da.hot-update.js", + "/chunks/invitation.444a53b6737bffb1b1da.hot-update.js": "/chunks/invitation.444a53b6737bffb1b1da.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2aaaf6dd8d0d63390d97.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.2aaaf6dd8d0d63390d97.hot-update.js", + "/chunks/invitation.2aaaf6dd8d0d63390d97.hot-update.js": "/chunks/invitation.2aaaf6dd8d0d63390d97.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.190ccbaf0a4a5aeb844b.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.190ccbaf0a4a5aeb844b.hot-update.js", + "/chunks/invitation.190ccbaf0a4a5aeb844b.hot-update.js": "/chunks/invitation.190ccbaf0a4a5aeb844b.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c6ac017e509819ed701a.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.c6ac017e509819ed701a.hot-update.js", + "/chunks/invitation.c6ac017e509819ed701a.hot-update.js": "/chunks/invitation.c6ac017e509819ed701a.hot-update.js", + "/chunks/platform.a6d3654c7b374df4f392.hot-update.js": "/chunks/platform.a6d3654c7b374df4f392.hot-update.js", + "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.7f7b8fd6aaa3ab5c119b.hot-update.js": "/chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~chunks/share~c7960950.7f7b8fd6aaa3ab5c119b.hot-update.js", + "/chunks/platform.40ca1af0128c29ddba55.hot-update.js": "/chunks/platform.40ca1af0128c29ddba55.hot-update.js", + "/js/main.78489affcd9a63dcff1b.hot-update.js": "/js/main.78489affcd9a63dcff1b.hot-update.js", + "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1ee38cce08f672b31e42.hot-update.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.1ee38cce08f672b31e42.hot-update.js", + "/chunks/invitation.1ee38cce08f672b31e42.hot-update.js": "/chunks/invitation.1ee38cce08f672b31e42.hot-update.js" } diff --git a/resources/js/components/FilesView/MemberAvatar.vue b/resources/js/components/FilesView/MemberAvatar.vue index 63cf77f2..c8505995 100644 --- a/resources/js/components/FilesView/MemberAvatar.vue +++ b/resources/js/components/FilesView/MemberAvatar.vue @@ -11,10 +11,10 @@
- + {{ letter }}
@@ -31,13 +31,24 @@ ], computed: { letter() { - return this.member.data.attributes.name.substr(0, 1) + let string = this.member.data.attributes.name + ? this.member.data.attributes.name + : this.member.data.attributes.email + + return string.substr(0, 1) }, borderRadius() { return this.size > 32 ? 'rounded-xl' : 'rounded-lg' }, fontSize() { - return this.size > 32 ? 'text-base' : 'text-sm' + + if (this.size > 42) { + return 'text-lg' + } else if (this.size > 32) { + return 'text-base' + } else { + return 'text-sm' + } }, } } diff --git a/resources/js/components/Teams/Components/TeamList.vue b/resources/js/components/Teams/Components/TeamList.vue index b41d9f83..6152c15d 100644 --- a/resources/js/components/Teams/Components/TeamList.vue +++ b/resources/js/components/Teams/Components/TeamList.vue @@ -5,14 +5,16 @@
-
- -
+ + + + +
{{ entry.name }} @@ -21,6 +23,8 @@ {{ entry.email }}
+ +
{{ entry.email }} diff --git a/resources/js/components/Teams/Components/TeamMembersPreview.vue b/resources/js/components/Teams/Components/TeamMembersPreview.vue index 11c90d09..0578c4ac 100644 --- a/resources/js/components/Teams/Components/TeamMembersPreview.vue +++ b/resources/js/components/Teams/Components/TeamMembersPreview.vue @@ -4,7 +4,7 @@ 3+
-
+
diff --git a/resources/js/components/Teams/EditTeamFolderPopup.vue b/resources/js/components/Teams/EditTeamFolderPopup.vue index 8b534910..b6be8b33 100644 --- a/resources/js/components/Teams/EditTeamFolderPopup.vue +++ b/resources/js/components/Teams/EditTeamFolderPopup.vue @@ -67,7 +67,7 @@ import axios from "axios"; export default { - name: 'UpdateTeamFolderPopup', + name: 'EditTeamFolderPopup', components: { ValidationProvider, ValidationObserver, diff --git a/resources/js/helpers/functionHelpers.js b/resources/js/helpers/functionHelpers.js index a24d1396..a74a8fa7 100644 --- a/resources/js/helpers/functionHelpers.js +++ b/resources/js/helpers/functionHelpers.js @@ -354,6 +354,7 @@ const FunctionHelpers = { attributes: { avatar: entry.avatar, name: entry.name, + email: entry.email, color: entry.color, } } diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js index 762828ed..b1d7e166 100644 --- a/resources/js/store/modules/app.js +++ b/resources/js/store/modules/app.js @@ -26,7 +26,6 @@ const defaultState = { teamPermissions: { 'can-edit': 'Can Edit', 'can-view': 'Can View', - 'can-view-and-download': 'Can View & Download', }, countries: [ {label: 'Czech Republic', value: 'CZ'}, diff --git a/src/Domain/Folders/Models/Folder.php b/src/Domain/Folders/Models/Folder.php index 4943b64a..e8be7dac 100644 --- a/src/Domain/Folders/Models/Folder.php +++ b/src/Domain/Folders/Models/Folder.php @@ -187,7 +187,8 @@ class Folder extends Model public function teamInvitations(): HasMany { - return $this->hasMany(TeamFolderInvitation::class, 'parent_id', 'id'); + return $this->hasMany(TeamFolderInvitation::class, 'parent_id', 'id') + ->where('status', 'pending'); } public function teamMembers(): BelongsToMany