Fix merge issues

specklesystems · Oct 14, 2024 · ab71daa · ab71daa
1 parent b422fc3
commit ab71daa
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 642 deletions.
diff --git a/packages/frontend-2/assets/images/banners/earlybird.gif b/packages/frontend-2/assets/images/banners/earlybird.gif
diff --git a/packages/frontend-2/assets/images/banners/submit.gif b/packages/frontend-2/assets/images/banners/submit.gif
diff --git a/packages/frontend-2/components/project/page/models/StructureItem.vue b/packages/frontend-2/components/project/page/models/StructureItem.vue
@@ -1,7 +1,7 @@
 <!-- eslint-disable vuejs-accessibility/no-static-element-interactions -->
 <!-- eslint-disable vuejs-accessibility/mouse-events-have-key-events -->
 <template>
-  <div class="space-y-4 relative">
+  <div class="space-y-4 relative" @mouseleave="showActionsMenu = false">
     <div
       v-if="itemType !== StructureItemType.ModelWithOnlySubmodels"
       class="group relative bg-foundation w-full p-2 flex flex-row rounded-md transition-all border border-outline-3 items-stretch"

diff --git a/packages/frontend-2/components/promo-banners/Workspace.vue b/packages/frontend-2/components/promo-banners/Workspace.vue
diff --git a/packages/frontend-2/layouts/default.vue b/packages/frontend-2/layouts/default.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <HeaderNavBar />
-    <PromoBannersWorkspace />
     <div class="h-dvh w-dvh overflow-hidden flex flex-col">
       <!-- Static Spacer to allow for absolutely positioned HeaderNavBar  -->
       <div class="h-12 w-full shrink-0"></div>

diff --git a/packages/frontend-2/lib/common/generated/gql/graphql.ts b/packages/frontend-2/lib/common/generated/gql/graphql.ts
@@ -4507,12 +4507,6 @@ export type WorkspaceInviteDiscoverableWorkspaceBanner_WorkspaceFragment = { __t
 
 export type WorkspacePageVersionCount_WorkspaceVersionsCountFragment = { __typename?: 'WorkspaceVersionsCount', current: number, max: number };
 
-export type WorkspaceInviteDiscoverableWorkspaceBanner_DiscoverableWorkspaceFragment = { __typename?: 'DiscoverableWorkspace', id: string, name: string, description?: string | null, logo?: string | null, defaultLogoIndex: number };
-
-export type WorkspaceInviteDiscoverableWorkspaceBanner_WorkspaceFragment = { __typename?: 'Workspace', id: string, name: string, description?: string | null, createdAt: string, updatedAt: string, logo?: string | null, defaultLogoIndex: number, domainBasedMembershipProtectionEnabled: boolean, discoverabilityEnabled: boolean };
-
-export type WorkspacePageVersionCount_WorkspaceVersionsCountFragment = { __typename?: 'WorkspaceVersionsCount', current: number, max: number };
-
 export type ActiveUserMainMetadataQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -5640,10 +5634,6 @@ export type WorkspaceMixpanelUpdateGroup_WorkspaceCollaboratorFragment = { __typ
 
 export type WorkspaceMixpanelUpdateGroup_WorkspaceFragment = { __typename?: 'Workspace', id: string, name: string, description?: string | null, domainBasedMembershipProtectionEnabled: boolean, discoverabilityEnabled: boolean, billing?: { __typename?: 'WorkspaceBilling', cost: { __typename?: 'WorkspaceCost', total: number }, versionsCount: { __typename?: 'WorkspaceVersionsCount', current: number, max: number } } | null, team: { __typename?: 'WorkspaceCollaboratorCollection', totalCount: number, items: Array<{ __typename?: 'WorkspaceCollaborator', id: string, role: string }> } };
 
-export type WorkspaceMixpanelUpdateGroup_WorkspaceCollaboratorFragment = { __typename?: 'WorkspaceCollaborator', id: string, role: string };
-
-export type WorkspaceMixpanelUpdateGroup_WorkspaceFragment = { __typename?: 'Workspace', id: string, name: string, description?: string | null, domainBasedMembershipProtectionEnabled: boolean, discoverabilityEnabled: boolean, billing?: { __typename?: 'WorkspaceBilling', cost: { __typename?: 'WorkspaceCost', total: number }, versionsCount: { __typename?: 'WorkspaceVersionsCount', current: number, max: number } } | null, team: { __typename?: 'WorkspaceCollaboratorCollection', totalCount: number, items: Array<{ __typename?: 'WorkspaceCollaborator', id: string, role: string }> } };
-
 export type UpdateRoleMutationVariables = Exact<{
   input: WorkspaceRoleUpdateInput;
 }>;

diff --git a/packages/server/modules/core/services/streams/streamAccessService.js b/packages/server/modules/core/services/streams/streamAccessService.js