From 63735eb044253ff862d0b9dec4ede9136f17b1f1 Mon Sep 17 00:00:00 2001 From: Chuck Driesler Date: Wed, 21 Aug 2024 13:53:37 +0100 Subject: [PATCH] feat(workspaces): work(space) invader default logos (#2708) * feat(workspaces): add default logo index * Added WorkspaceAvatar component * Added WorkspaceAvatar component * Fix issues * Fix Avatar --------- Co-authored-by: Mike Tasset --- .../components/dashboard/Sidebar.vue | 9 +++- .../frontend-2/components/settings/Dialog.vue | 8 +++- .../components/workspace/Avatar.vue | 45 +++++++++++++++++++ .../components/workspace/header/Header.vue | 9 ++-- .../lib/common/generated/gql/gql.ts | 13 ++++-- .../lib/common/generated/gql/graphql.ts | 23 ++++++---- .../lib/workspaces/composables/avatar.ts | 13 ++++++ .../images/workspace/avatars/avatar_0.svg | 16 +++++++ .../images/workspace/avatars/avatar_1.svg | 13 ++++++ .../images/workspace/avatars/avatar_2.svg | 8 ++++ .../images/workspace/avatars/avatar_3.svg | 8 ++++ .../typedefs/workspaces.graphql | 6 +++ .../modules/core/graph/generated/graphql.ts | 5 +++ .../graph/generated/graphql.ts | 4 ++ .../modules/shared/test/unit/eventBus.spec.ts | 1 + .../workspaces/graph/resolvers/workspaces.ts | 5 ++- .../server/modules/workspaces/helpers/db.ts | 3 +- .../workspaces/repositories/workspaces.ts | 2 +- .../modules/workspaces/services/management.ts | 2 + .../workspaces/tests/helpers/creation.ts | 3 +- .../tests/integration/repositories.spec.ts | 3 +- .../tests/unit/services/management.spec.ts | 3 +- .../modules/workspacesCore/domain/types.ts | 1 + .../20240820131619_fallbackWorkspaceLogo.ts | 13 ++++++ .../server/test/graphql/generated/graphql.ts | 4 ++ .../src/components/user/Avatar.vue | 5 +-- packages/ui-components/src/lib.ts | 2 + 27 files changed, 198 insertions(+), 29 deletions(-) create mode 100644 packages/frontend-2/components/workspace/Avatar.vue create mode 100644 packages/frontend-2/lib/workspaces/composables/avatar.ts create mode 100644 packages/frontend-2/public/images/workspace/avatars/avatar_0.svg create mode 100644 packages/frontend-2/public/images/workspace/avatars/avatar_1.svg create mode 100644 packages/frontend-2/public/images/workspace/avatars/avatar_2.svg create mode 100644 packages/frontend-2/public/images/workspace/avatars/avatar_3.svg create mode 100644 packages/server/modules/workspacesCore/migrations/20240820131619_fallbackWorkspaceLogo.ts diff --git a/packages/frontend-2/components/dashboard/Sidebar.vue b/packages/frontend-2/components/dashboard/Sidebar.vue index 2b0102793..78903a38e 100644 --- a/packages/frontend-2/components/dashboard/Sidebar.vue +++ b/packages/frontend-2/components/dashboard/Sidebar.vue @@ -68,7 +68,11 @@ :active="isActive(item.to)" > @@ -172,7 +176,8 @@ const workspacesItems = computed(() => label: workspace.name, id: workspace.id, to: workspaceRoute(workspace.id), - logo: workspace.logo + logo: workspace.logo, + defaultLogoIndex: workspace.defaultLogoIndex })) : [] ) diff --git a/packages/frontend-2/components/settings/Dialog.vue b/packages/frontend-2/components/settings/Dialog.vue index 458886739..43f8ffca7 100644 --- a/packages/frontend-2/components/settings/Dialog.vue +++ b/packages/frontend-2/components/settings/Dialog.vue @@ -52,7 +52,11 @@ collapsible > +
+
+
+ + + diff --git a/packages/frontend-2/components/workspace/header/Header.vue b/packages/frontend-2/components/workspace/header/Header.vue index 7b1daca3e..b41643996 100644 --- a/packages/frontend-2/components/workspace/header/Header.vue +++ b/packages/frontend-2/components/workspace/header/Header.vue @@ -1,9 +1,11 @@