Skip to content

Commit

Permalink
Merge branch 'main' into no-app-generator-cs-7635
Browse files Browse the repository at this point in the history
  • Loading branch information
backspace committed Dec 11, 2024
2 parents 8d30324 + d517201 commit c5baf8e
Show file tree
Hide file tree
Showing 12 changed files with 684 additions and 270 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,45 @@
"data": {
"type": "card",
"attributes": {
"name": "Sophia Nguyen",
"primaryEmail": null,
"secondaryEmail": null,
"firstName": "Elma",
"lastName": "Odsey",
"position": "Head of Recruitment",
"department": "app",
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"country": null,
"area": null,
"phoneNumber": null
"type": "mobile",
"country": 6,
"area": 10,
"number": 3810923
},
"phoneOffice": {
"country": null,
"area": null,
"phoneNumber": null
"type": "office",
"country": 615,
"area": 724,
"number": 3789
},
"status": {
"index": null,
"label": null
"index": 0,
"label": "Customer"
},
"socialLinks": [
{
"label": "LinkedIn",
"value": "https://www.google.com/"
},
{
"label": "X",
"value": "https://www.google.com/"
}
],
"description": null,
"thumbnailURL": null
"thumbnailURL": "https://images.pexels.com/photos/1624229/pexels-photo-1624229.jpeg?auto=compress&cs=tinysrgb&w=300&h=300&dpr=2"
},
"relationships": {
"company": {
"links": {
"self": null
"self": "../Company/9203c173-3420-44b3-863d-90defd7c57c8"
}
}
},
Expand All @@ -36,4 +51,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,40 @@
"data": {
"type": "card",
"attributes": {
"name": "Olivia Chen",
"primaryEmail": null,
"secondaryEmail": null,
"firstName": "Sophia",
"lastName": "Nguyen",
"position": "Sale Manager",
"department": "app",
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"country": null,
"area": null,
"phoneNumber": null
"type": "mobile",
"country": 1,
"area": 510,
"number": 5550145
},
"phoneOffice": {
"country": null,
"area": null,
"phoneNumber": null
"type": "office",
"country": 1,
"area": 510,
"number": 5552345
},
"status": {
"index": 1,
"label": "Lead"
"index": 0,
"label": "Customer"
},
"socialLinks": [
{
"label": "LinkedIn",
"value": "https://www.google.com/"
},
{
"label": "X",
"value": "https://www.google.com/"
}
],
"description": null,
"thumbnailURL": null
"thumbnailURL": "https://images.pexels.com/photos/4974417/pexels-photo-4974417.jpeg?auto=compress&cs=tinysrgb&w=300&h=300&dpr=2"
},
"relationships": {
"company": {
Expand All @@ -36,4 +51,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,45 @@
"data": {
"type": "card",
"attributes": {
"name": "Ethan Rodriguez",
"primaryEmail": null,
"secondaryEmail": null,
"firstName": "Ethan",
"lastName": "Smith",
"position": "Software Engineer",
"department": "app",
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"country": null,
"area": null,
"phoneNumber": null
"type": "mobile",
"country": 1,
"area": 510,
"number": 123456
},
"phoneOffice": {
"country": null,
"area": null,
"phoneNumber": null
"type": "office",
"country": 1,
"area": 510,
"number": 2442322
},
"status": {
"index": null,
"label": null
"index": 1,
"label": "Lead"
},
"socialLinks": [
{
"label": "LinkedIn",
"value": "https://www.google.com/"
},
{
"label": "X",
"value": "https://www.google.com/"
}
],
"description": null,
"thumbnailURL": null
"thumbnailURL": "https://images.pexels.com/photos/1681010/pexels-photo-1681010.jpeg?auto=compress&cs=tinysrgb&w=300&h=300&dpr=2"
},
"relationships": {
"company": {
"links": {
"self": null
"self": "../Company/e1856419-27b0-4ce3-98fe-759d21c7144f"
}
}
},
Expand All @@ -36,4 +51,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,45 @@
"data": {
"type": "card",
"attributes": {
"name": "Liam O'Connor",
"primaryEmail": null,
"secondaryEmail": null,
"firstName": "Liam",
"lastName": "O'Connor",
"position": "Data Analystic",
"department": "app",
"primaryEmail": "[email protected]",
"secondaryEmail": "[email protected]",
"phoneMobile": {
"country": null,
"area": null,
"phoneNumber": null
"type": "mobile",
"country": 1,
"area": 510,
"number": 2323423
},
"phoneOffice": {
"country": null,
"area": null,
"phoneNumber": null
"type": "office",
"country": 1,
"area": 510,
"number": 1231232
},
"status": {
"index": null,
"label": null
"index": 1,
"label": "Lead"
},
"socialLinks": [
{
"label": "LinkedIn",
"value": "https://www.google.com/"
},
{
"label": "X",
"value": "https://www.google.com/"
}
],
"description": null,
"thumbnailURL": null
"thumbnailURL": "https://images.pexels.com/photos/3785079/pexels-photo-3785079.jpeg?auto=compress&cs=tinysrgb&w=300&h=300&dpr=2"
},
"relationships": {
"company": {
"links": {
"self": null
"self": "../Company/e1856419-27b0-4ce3-98fe-759d21c7144f"
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"data": {
"type": "card",
"attributes": {
"name": "Application",
"name": "App",
"color": "",
"description": null,
"thumbnailURL": null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,25 @@
"data": {
"type": "card",
"attributes": {
"taskName": "Pill Picker Example",
"taskDetail": "Use multi-select but for pills",
"status": {
"index": 1,
"label": "Next Sprint"
},
"priority": {
"index": 1,
"label": "Medium"
},
"status": {
"completed": false,
"index": 1,
"label": "Next Sprint"
},
"taskName": "Pill Picker Example",
"dateRange": {
"start": "2024-11-14",
"end": "2024-12-15"
"start": "2024-12-08",
"end": "2024-12-10"
},
"taskDetail": "Use multi-select but for pills",
"description": null,
"thumbnailURL": null
},
"relationships": {
"assignee": {
"links": {
"self": null
}
},
"project": {
"links": {
"self": "../Project/51ca069b-1c55-4648-8654-bd82bf162f9d"
Expand All @@ -40,6 +36,11 @@
"self": null
}
},
"assignee": {
"links": {
"self": null
}
},
"tags.0": {
"links": {
"self": "../Tag/ad921cba-ffc7-4fdb-af34-ab8b93eae228"
Expand All @@ -63,4 +64,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,25 @@
"data": {
"type": "card",
"attributes": {
"taskName": "Create RHS Sheet",
"taskDetail": null,
"status": {
"index": 0,
"label": "Backlog"
},
"priority": {
"index": null,
"label": null
},
"status": {
"completed": false,
"index": 0,
"label": "Backlog"
},
"taskName": "Create RHS Sheet",
"dateRange": {
"start": "2024-11-13",
"end": "2024-11-14"
"start": "2024-12-01",
"end": "2024-12-08"
},
"taskDetail": null,
"description": null,
"thumbnailURL": null
},
"relationships": {
"assignee": {
"links": {
"self": "../TeamMember/4c9614cd-ecda-42cf-bc18-37903019a7be"
}
},
"project": {
"links": {
"self": null
Expand All @@ -40,6 +36,11 @@
"self": null
}
},
"assignee": {
"links": {
"self": "../TeamMember/4c9614cd-ecda-42cf-bc18-37903019a7be"
}
},
"tags": {
"links": {
"self": null
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 @@ -40,7 +40,7 @@ export default class AvatarGroup extends GlimmerComponent<AvatarGroupSignature>
.avatar-group {
display: flex;
align-items: center;
gap: var(--boxel-sp);
gap: var(--boxel-sp-sm);
min-width: 0;
}
.avatar-thumbnail {
Expand Down
2 changes: 1 addition & 1 deletion packages/experiments-realm/crm/company.gts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import BuildingIcon from '@cardstack/boxel-icons/building';

class ViewCompanyTemplate extends Component<typeof Company> {
<template>
<div class='row'>
<div class='row company-group'>
<BuildingIcon class='icon' />

{{#if @model.name}}
Expand Down
Loading

0 comments on commit c5baf8e

Please sign in to comment.