Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions crates/core/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ impl From<legacy::LandscapeData> for LandscapeData {
item.docker_url = extra.docker_url;
item.documentation_url = extra.documentation_url;
item.facebook_url = extra.facebook_url;
item.funding_url = extra.funding_url;
item.github_discussions_url = extra.github_discussions_url;
item.gitter_url = extra.gitter_url;
item.graduated_at = extra.graduated;
Expand Down Expand Up @@ -600,6 +601,9 @@ pub struct Item {
#[serde(skip_serializing_if = "Option::is_none")]
pub featured: Option<ItemFeatured>,

#[serde(skip_serializing_if = "Option::is_none")]
pub funding_url: Option<String>,

#[serde(skip_serializing_if = "Option::is_none")]
pub github_discussions_url: Option<String>,

Expand Down Expand Up @@ -1411,6 +1415,7 @@ mod tests {
docker_url: Some("docker_url".to_string()),
documentation_url: Some("documentation_url".to_string()),
facebook_url: Some("facebook_url".to_string()),
funding_url: Some("funding_url".to_string()),
github_discussions_url: Some("github_discussions_url".to_string()),
gitter_url: Some("gitter_url".to_string()),
graduated: Some(date),
Expand Down Expand Up @@ -1500,6 +1505,7 @@ mod tests {
enduser: Some(false),
facebook_url: Some("facebook_url".to_string()),
featured: None,
funding_url: Some("funding_url".to_string()),
github_discussions_url: Some("github_discussions_url".to_string()),
gitter_url: Some("gitter_url".to_string()),
graduated_at: Some(date),
Expand Down
2 changes: 2 additions & 0 deletions crates/core/src/data/legacy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ pub(super) struct ItemExtra {
pub docker_url: Option<String>,
pub documentation_url: Option<String>,
pub facebook_url: Option<String>,
pub funding_url: Option<String>,
pub github_discussions_url: Option<String>,
pub gitter_url: Option<String>,
pub graduated: Option<NaiveDate>,
Expand Down Expand Up @@ -239,6 +240,7 @@ fn validate_urls(item: &Item) -> Result<()> {
("docker", &extra.docker_url),
("documentation", &extra.documentation_url),
("facebook", &extra.facebook_url),
("funding", &extra.funding_url),
("github_discussions", &extra.github_discussions_url),
("gitter", &extra.gitter_url),
("linkedin", &extra.linkedin_url),
Expand Down
5 changes: 5 additions & 0 deletions docs/config/data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ categories:
# Facebook URL (optional).
facebook_url: https://facebook.com/url

# URL to external financial details (optional). When this field is set, the
# funding rounds table in the item's details view is hidden and this URL is shown
# instead.
funding_url: https://financial.details.url

# GitHub discussions URL (optional).
github_discussions_url: https://github.discussions.url

Expand Down
9 changes: 9 additions & 0 deletions docs/config/schema/data.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,15 @@
"format": "uri",
"pattern": "^https?://(www\\.)?facebook.com/.*"
},
"funding_url": {
"title": "Funding URL",
"description": "URL to external financial details. When provided, the funding rounds table in the item's details view is hidden and this URL is shown instead",
"type": "string",
"format": "uri",
"examples": [
"https://financial.details.url"
]
},
"github_discussions_url": {
"title": "GitHub discussions URL",
"type": "string",
Expand Down
16 changes: 15 additions & 1 deletion ui/common/src/components/ItemModalContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const OtherLink = css`
font-size: 0.75rem;
color: var(--color4);
max-width: calc(50% - 2rem - 15px);
line-height: 24px;
line-height: 1;
`;

const BadgeOutlineDark = css`
Expand Down Expand Up @@ -713,8 +713,22 @@ export const ItemModalContent = (props: Props) => {
</div>

{/* Funding rounds */}
<Show when={!isUndefined(itemInfo()!.funding_url) && !isEmpty(itemInfo()!.funding_url)}>
<div class={`fw-bold text-uppercase mt-3 mt-lg-4 mb-2 mb-lg-3 ${TitleInSection}`}>Funding rounds</div>
<div class="d-flex align-items-baseline w-100 my-3">
<small class="text-muted lh-1 me-2">For more financial details, see:</small>
<ExternalLink
class="text-muted d-inline-block text-truncate mw-100 lh-1 small"
href={itemInfo()!.funding_url!}
>
{itemInfo()!.funding_url!}
</ExternalLink>
</div>
</Show>
<Show
when={
(isUndefined(itemInfo()!.funding_url) || isEmpty(itemInfo()!.funding_url)) &&
!isUndefined(itemInfo()!.crunchbase_data) &&
!isUndefined(itemInfo()!.crunchbase_data!.funding_rounds) &&
!isEmpty(itemInfo()!.crunchbase_data!.funding_rounds!)
}
Expand Down
18 changes: 17 additions & 1 deletion ui/common/src/components/ItemModalMobileContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ const OtherLink = css`
max-width: calc(100% - 2rem - 15px);
font-size: 0.65rem !important;
color: var(--color4);
line-height: 16px;
line-height: 1;
`;

const Dot = css`
Expand Down Expand Up @@ -471,8 +471,24 @@ export const ItemModalMobileContent = (props: Props) => {
</div>

{/* Funding rounds */}
<Show when={!isUndefined(itemInfo()!.funding_url) && !isEmpty(itemInfo()!.funding_url)}>
<div class={`fw-bold text-uppercase mt-3 mt-lg-4 mb-2 mb-lg-3 ${TitleInSection}`}>Funding rounds</div>
<div class="w-100 my-1">
<small class="text-muted lh-1">For more financial details, see:</small>
<div class="mt-1 lh-1">
<ExternalLink
class="text-muted d-inline-block text-truncate text-decoration-underline mw-100 lh-1"
href={itemInfo()!.funding_url!}
>
{itemInfo()!.funding_url!}
</ExternalLink>
</div>
</div>
</Show>
<Show
when={
(isUndefined(itemInfo()!.funding_url) || isEmpty(itemInfo()!.funding_url)) &&
!isUndefined(itemInfo()!.crunchbase_data) &&
!isUndefined(itemInfo()!.crunchbase_data!.funding_rounds) &&
!isEmpty(itemInfo()!.crunchbase_data!.funding_rounds!)
}
Expand Down
1 change: 1 addition & 0 deletions ui/common/src/types/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export interface Item extends BaseItem {
docker_url?: string;
documentation_url?: string;
enduser?: boolean;
funding_url?: string;
github_discussions_url?: string;
graduated_at?: string;
incubating_at?: string;
Expand Down
1 change: 1 addition & 0 deletions ui/webapp/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export interface Item extends BaseItem {
docker_url?: string;
documentation_url?: string;
enduser?: boolean;
funding_url?: string;
github_discussions_url?: string;
graduated_at?: string;
incubating_at?: string;
Expand Down