Skip to content

Commit

Permalink
Merge branch 'main' into matrix/retention-backfill-logging
Browse files Browse the repository at this point in the history
  • Loading branch information
backspace committed Jan 21, 2025
2 parents 9a74a41 + 49ed00d commit ab7e6b8
Show file tree
Hide file tree
Showing 28 changed files with 1,070 additions and 295 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"primaryContact": {
"links": {
"self": "../Customer/dddaeabf-1e95-480c-b158-0873e31fc66c"
"self": "../Lead/4e70a791-dd4e-4b39-99a1-bb8070392437"
}
},
"contacts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
{
"data": {
"type": "card",
"attributes": {
"status": {
"index": 1,
"label": "In Progress",
"color": "#FFB74D",
"completed": false
},
"dateRange": {
"start": null,
"end": null
},
"priority": {
"index": null,
"label": null
},
"name": "Call on discussion about next step",
"details": null,
"description": null,
"thumbnailURL": null
},
"relationships": {
"crmApp": {
"links": {
"self": null
}
},
"subtasks": {
"links": {
"self": null
}
},
"assignee": {
"links": {
"self": null
}
},
"contact": {
"links": {
"self": null
}
},
"account": {
"links": {
"self": "../Account/be0192c4-e566-40ee-8a57-f88f7ab37e53"
}
},
"deal": {
"links": {
"self": null
}
},
"tags": {
"links": {
"self": null
}
}
},
"meta": {
"adoptsFrom": {
"module": "../crm/task",
"name": "CRMTask"
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"type": "card",
"attributes": {
"status": {
"index": 0,
"label": "Not Started",
"color": null,
"completed": false
"index": 2,
"label": "Done",
"color": "#66BB6A",
"completed": true
},
"dateRange": {
"start": null,
"end": null
"start": "2025-01-22",
"end": "2025-02-04"
},
"priority": {
"index": 2,
Expand Down Expand Up @@ -44,7 +44,7 @@
},
"account": {
"links": {
"self": null
"self": "../Account/be0192c4-e566-40ee-8a57-f88f7ab37e53"
}
},
"deal": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,17 @@
},
"account": {
"links": {
"self": null
"self": "../Account/be0192c4-e566-40ee-8a57-f88f7ab37e53"
}
},
"deal": {
"links": {
"self": null
}
},
"tags": {
"tags.0": {
"links": {
"self": null
"self": "../Tag/8a14f671-4daf-4195-aca5-85dc143d15b8"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"type": "card",
"attributes": {
"status": {
"index": 1,
"label": "In Progress",
"color": null,
"index": 0,
"label": "Not Started",
"color": "#B0BEC5",
"completed": false
},
"dateRange": {
Expand Down Expand Up @@ -44,7 +44,7 @@
},
"account": {
"links": {
"self": null
"self": "../Account/77976251-6bc8-4a8c-972f-f9d588e8434d"
}
},
"deal": {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,34 @@
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"type": "mobile",
"country": 1,
"area": 510,
"number": 123456
"phoneNumber": {
"number": "2065553411",
"countryCode": "1"
},
"type": {
"index": 0,
"label": "Mobile",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"phoneOffice": {
"type": "office",
"country": 1,
"area": 510,
"number": 2442322
"phoneNumber": {
"number": "2065551123",
"countryCode": null
},
"type": {
"index": 2,
"label": "Work",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"socialLinks": [
{
Expand Down Expand Up @@ -47,4 +65,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,32 @@
"secondaryEmail": null,
"phoneMobile": {
"phoneNumber": {
"number": "2065551111",
"number": "2065521411",
"countryCode": "1"
},
"type": {
"index": 0,
"label": "Mobile"
"label": "Mobile",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"phoneOffice": {
"phoneNumber": {
"number": null,
"number": "2062851123",
"countryCode": null
},
"type": {
"index": null,
"label": null
"index": 2,
"label": "Work",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"socialLinks": [
Expand All @@ -38,17 +48,6 @@
"value": "@johnsmith"
}
],
"statusTag": {
"lightColor": "#93C5FD",
"darkColor": "#3B82F6",
"index": null,
"label": "Lead",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
},
"description": "Showed interest through website contact form",
"thumbnailURL": "https://images.pexels.com/photos/2379004/pexels-photo-2379004.jpeg"
},
Expand All @@ -66,4 +65,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,34 @@
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"type": "mobile",
"country": 1,
"area": 510,
"number": 2323423
"phoneNumber": {
"number": "2165582411",
"countryCode": "1"
},
"type": {
"index": 0,
"label": "Mobile",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"phoneOffice": {
"type": "office",
"country": 1,
"area": 510,
"number": 1231232
"phoneNumber": {
"number": "2165551123",
"countryCode": null
},
"type": {
"index": 2,
"label": "Work",
"color": null,
"colorScheme": {
"foregroundColor": null,
"backgroundColor": null
}
}
},
"socialLinks": [
{
Expand Down
2 changes: 1 addition & 1 deletion packages/experiments-realm/components/avatar-group.gts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export default class AvatarGroup extends GlimmerComponent<AvatarGroupSignature>
text-overflow: ellipsis;
overflow: hidden;
margin: 0;
font-size: var(--boxel-font-size-med);
font-size: var(--boxel-font-size);
font-weight: 600;
letter-spacing: var(--boxel-lsp-sm);
}
Expand Down
Loading

0 comments on commit ab7e6b8

Please sign in to comment.