Skip to content

Commit

Permalink
Merge branch 'development' into feat/oasis-pontus-x-support
Browse files Browse the repository at this point in the history
  • Loading branch information
moritzkirstein committed Feb 6, 2024
2 parents a4f4738 + 735106b commit 9965332
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 21 deletions.
42 changes: 35 additions & 7 deletions content/site.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,25 @@
"category": "mobility"
},
{
"name": "Cooperants",
"name": "COOPERANTS",
"link": "https://cooperants.pontus-x.eu/",
"description": "The world's only collaborative alliance in the Aeronautics and space sector that solves pressing digital collaboration problems by creating a common data space.",
"image": "cooperants-logo.webp",
"category": "space"
"category": "manufacturing"
},
{
"name": "Airbus",
"link": "https://airbus.pontus-x.eu/",
"description": "For those who make this world a safer place. We pioneer defense and space for their mission success.",
"image": "airbus-logo.webp",
"category": "space"
"category": "manufacturing"
},
{
"name": "Service-Meister",
"link": "https://servicemeister.pontus-x.eu/",
"description": "An AI-based Service Ecosystem for Technical Service in the Age of Industry 4.0.",
"image": "service-meister-logo.webp",
"category": "manufacturing"
"category": "AI"
},
{
"name": "Future Mobility Marketplace",
Expand All @@ -71,14 +71,14 @@
"link": "https://sbb.pontus-x.eu/",
"description": "Explore the Open Science Ecosystem, a collaboration of libraries, universities, and science pioneers under Gaia-X principles for limitless shared knowledge.",
"image": "sbb-logo.webp",
"category": "science"
"category": "language models"
},
{
"name": "EnergySHR",
"link": "https://www.energyshr.nl/",
"description": "A platform for sharing (SHR) datasets and AI algorithms that contribute to solving challenges of the energy transition.",
"image": "energy-shr-logo.webp",
"category": "science"
"category": "energy"
},
{
"name": "Clinical Insights Exchange",
Expand All @@ -92,7 +92,35 @@
"link": "https://dataspace.angliru.udl.cat/",
"description": "An open research platform following the FAIR guiding principles of findability, accessibility, interoperability and reusability, while guaranteeing data sovereignty.",
"image": "udl-logo.webp",
"category": "science"
"category": "agriculture"
},
{
"name": "Under Construction: Dione-X",
"link": "https://dione-x.de/en/",
"description": "Secure and efficient data spaces for the machining value network and industry 4.0.",
"image": "dione-x-logo.webp",
"category": "manufacturing"
},
{
"name": "Under Construction: ACCURATE",
"link": "https://ec.europa.eu/info/funding-tenders/opportunities/portal/screen/how-to-participate/org-details/999999999/project/101138269/program/43108390/details",
"description": "The ACCURATE project aims to boost the competitiveness of European manufacturing companies with DSS and Manufacturing as a Service frameworks. ",
"image": "accurate-logo.webp",
"category": "manufacturing"
},
{
"name": "Under Construction: Flex4Res",
"link": "https://www.flex4res.eu/",
"description": "Flex4Res stands for Data spaces for FLEXible production lines and supply chains FOR RESilient manufacturing. Flex4Res develops an open platform for secure and sovereign data exchange",
"image": "flex4res-logo.webp",
"category": "manufacturing"
},
{
"name": "deltaDAO AI marketplace",
"link": "https://market.delta-dao.com/",
"description": "With deltaDAO's AI Marketplace, you have the freedom to decide how your AI service is offered. By keeping your AI private, you retain full control and do not disclose your valuable IP.",
"image": "deltadao-logo.webp",
"category": "AI"
}
]
}
Expand Down
Binary file added public/images/ecosystem/accurate-logo.webp
Binary file not shown.
Binary file added public/images/ecosystem/deltadao-logo.webp
Binary file not shown.
Binary file added public/images/ecosystem/dione-x-logo.webp
Binary file not shown.
Binary file added public/images/ecosystem/flex4res-logo.webp
Binary file not shown.
23 changes: 23 additions & 0 deletions src/components/Search/Filter.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,29 @@
gap: calc(var(--spacer) / 2);
}

.sidePositioning h3 {
color: var(--filter-title-color);
font-size: var(--filter-title-font-size);
}

.sidePositioning h5,
.topPositioning h3 {
color: var(--filter-type-color);
font-size: var(--filter-type-font-size);
}

.filterList label {
color: var(--filter-label-color);
font-size: var(--filter-label-font-size);
}

.clearBtn {
color: var(--filter-clear-color);
}
.clearBtn:hover {
color: var(--filter-clear-hover-color);
}

.filtersHeader {
display: flex;
justify-content: space-between;
Expand Down
1 change: 1 addition & 0 deletions src/components/Search/Filter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ export default function Filter({
onClick={async () => {
clearFilters(addFiltersToUrl)
}}
className={styles.clearBtn}
>
Clear filters
</Button>
Expand Down
4 changes: 1 addition & 3 deletions src/components/Search/sort.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
}

.sortList {
display: flex;
flex-direction: column;
gap: calc(var(--spacer) / 2);
composes: filterList from './Filter.module.css';
}

.sortList div *,
Expand Down
19 changes: 8 additions & 11 deletions src/stylesGlobal/_variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -119,17 +119,14 @@
--pagination-hover-font-color: var(--color-highlight);

/* Filter and sort */
--filter-font-color: var(--color-secondary);
--filter-hover-font-color: var(--font-color-text);
--filter-selected-font-color: var(--background-body);
--filter-background: var(--background-content);
--filter-selected-background: var(--font-color-text);
--filter-border-radius: var(--border-radius);
--filter-border-size: var(--border-size-sm);
--filter-border-color: var(--border-color);
--filter-selected-border-color: var(--background-body);
--filter-clear-font-color: var(--color-secondary);
--filter-clear-hover-font-color: var(--color-highlight);
--filter-title-color: var(--font-color-heading);
--filter-title-font-size: var(--font-size-title);
--filter-type-color: var(--font-color-text);
--filter-type-font-size: var(--font-size-large);
--filter-label-color: var(--font-color-text);
--filter-label-font-size: var(--font-size-base);
--filter-clear-color: var(--color-primary);
--filter-clear-hover-color: var(--color-highlight);

/* Confetti */
--confetti-color-one: var(--brand-blue-light);
Expand Down

0 comments on commit 9965332

Please sign in to comment.