Skip to content

Commit

Permalink
Merge pull request #54 from near/develop
Browse files Browse the repository at this point in the history
Promote develop -> main
  • Loading branch information
shelegdmitriy authored Jun 27, 2024
2 parents 2de8c93 + 58df046 commit 31b9bb6
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 8 deletions.
Binary file added public/images/ai/cosmose.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ai/exabits.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/ai/ringfence.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 7 additions & 3 deletions src/components/navigation/desktop/MainNavigationMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,19 @@ const NearAiLink = styled(NavLink)`
height: 40px;
cursor: pointer;
position: relative;
text-decoration: none;
&:hover,
&:focus {
&:hover {
background: var(--sand4);
color: var(--sand12);
text-decoration: none;
text-underline-offset: unset;
}
&:hover,
&:focus {
text-decoration: none;
}
i {
position: absolute;
top: 4px;
Expand Down
35 changes: 32 additions & 3 deletions src/components/pages/Ai.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,18 @@ const ecosystemTeams = [
image: '/images/ai/bitte.png',
height: '28px',
},
{
url: 'https://cosmose.ai',
name: 'Cosmose',
image: '/images/ai/cosmose.png',
height: '28px',
},
{
url: 'https://www.exabits.ai',
name: 'Exabits',
image: '/images/ai/exabits.png',
height: '28px',
},
{
url: 'https://hyperbolic.xyz',
name: 'Hyperbolic',
Expand Down Expand Up @@ -179,6 +191,12 @@ const ecosystemTeams = [
image: '/images/ai/pond.png',
height: '28px',
},
{
url: 'https://www.ringfence.ai',
name: 'Ringfence',
image: '/images/ai/ringfence.png',
height: '28px',
},
];

const getInvolvedItems = [
Expand Down Expand Up @@ -213,7 +231,7 @@ const getInvolvedItems = [
];

export const Ai = () => {
const { events } = useEvents(LUMA_NEAR_AI_CALENDAR_ID);
const { events, hasMoreEvents } = useEvents(LUMA_NEAR_AI_CALENDAR_ID);
return (
<Wrapper>
<AiSection $backgroundColor="#9797FF">
Expand Down Expand Up @@ -327,9 +345,20 @@ export const Ai = () => {
</Section>

<Section $backgroundColor="var(--violet6)">
<Container>
<Container $gap="48px">
<Flex $direction="column" $gap="24px">
<H2>Upcoming NEAR AI Events</H2>
<Flex $alignItems="center" $justifyContent="space-between">
<H2>Upcoming NEAR AI Events</H2>
{hasMoreEvents && (
<Button
href="https://lu.ma/edgeAGI"
target="_blank"
label="View All"
variant="secondary"
size="small"
/>
)}
</Flex>
<Text $size="text-2xl" $mobileSize="text-l" style={{ maxWidth: '808px' }}>
Join us at conferences, meetups, and more as we gather across the globe to discuss the future of
User-Owned AI.
Expand Down
4 changes: 2 additions & 2 deletions src/components/pages/Events.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const CoverCardImageWrapper = styled.div`
`;

export const Events = () => {
const { events, hasMoreEvents } = useEvents(LUMA_NEAR_CALENDAR_ID, 4);
const { events, hasMoreEvents } = useEvents(LUMA_NEAR_CALENDAR_ID, 7);
const featuredEvent = events[0] as MappedEvent | undefined;
const otherEvents = events.filter((event) => event.title !== featuredEvent?.title);

Expand Down Expand Up @@ -198,7 +198,7 @@ export const Events = () => {
)}
</Flex>

<Grid $columns="1fr 1fr 1fr" $gap="20px">
<Grid $columns="1fr 1fr 1fr" $gap="24px">
{otherEvents.map((event) => {
return (
<Article key={event.title} href={event.url} target="_blank" style={{ minWidth: 0 }}>
Expand Down

0 comments on commit 31b9bb6

Please sign in to comment.