Skip to content

Commit

Permalink
Merge pull request #638 from near/develop
Browse files Browse the repository at this point in the history
weekly promotion of develop to main
  • Loading branch information
charleslavon authored Feb 8, 2024
2 parents e791920 + 74e29d1 commit c82f24c
Show file tree
Hide file tree
Showing 4 changed files with 183 additions and 146 deletions.
1 change: 1 addition & 0 deletions indexers/accounts/accounts.sql
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ CREATE TABLE
"background_image" text,
"horizon_tnc" boolean,
"linktree" text,
"tags" text,
PRIMARY KEY ("account_id")
)
155 changes: 84 additions & 71 deletions src/NearOrg/DataAvailabilityPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const ipfsImages = {
vistara: "bafkreiecvztsb3iiyhh4lfjfzgh2xdvfoacl5izgw4keowjfmff44o7fdi",
altlayer: "bafkreig3mrzesoettretv2dhnxtgy22wubasgifzx4smybyldzbk35e3fm",
optimism: "bafkreidwitx5hu6hivyn3exi34moyea7livf6zfqk2dcny3z62ive7fpou",
zeeve: "bafkreigwtxjuraug4l2rltpoy4wau6gaom6e52fwgyqfpdsh2t6voe6ypm",
},
};

Expand Down Expand Up @@ -187,6 +188,7 @@ const LogoLinksWrapper = styled.div`
margin-top: 40px;
width: 100%;
position: relative;
text-align: center;
@media (max-width: 1170px) {
&::before {
Expand All @@ -202,28 +204,11 @@ const LogoLinksWrapper = styled.div`
}
`;

const LogoLinksScroll = styled.div`
overflow: auto;
scroll-behavior: smooth;
width: 100%;
text-align: center;
padding: 0 24px;
-ms-overflow-style: none; /* Internet Explorer 10+ */
scrollbar-width: none; /* Firefox */
&::-webkit-scrollbar {
display: none; /* Safari and Chrome */
}
@media (max-width: 1170px) {
padding-right: 40px;
}
`;

const LogoLinks = styled.div`
display: inline-flex;
align-items: center;
gap: 60px;
padding: 16px 24px;
a {
display: block;
Expand All @@ -242,35 +227,44 @@ const LogoLinks = styled.div`
}
`;

const web3Teams = [
const web3Teams2 = [
// {
// url: "https://docs.optimism.io/builders/chain-operators/hacks/data-availability#overview",
// name: "Optimism",
// ipfsImage: ipfsImages.logos.optimism,
// height: "29px",
// },
{
url: "https://docs.caldera.xyz/about/alternative-da",
name: "Caldera",
ipfsImage: ipfsImages.logos.caldera,
height: "28px",
url: "https://polygon.technology/polygon-cdk",
name: "Polygon",
ipfsImage: ipfsImages.logos.polygon,
height: "29px",
},
{
url: "https://docs.dymension.xyz/build/adv-guide/roller-adv/da-light-client",
name: "Dymension",
ipfsImage: ipfsImages.logos.dymension,
height: "28px",
url: "https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/on-chain-data/",
name: "Starknet",
ipfsImage: ipfsImages.logos.starknet,
height: "29px",
},
{
url: "https://docs.fluentlabs.xyz/learn/introduction/what-is-fluent#app-deployment-models",
name: "Fluent",
ipfsImage: ipfsImages.logos.fluent,
url: "https://docs.vistara.dev/rollups/create-a-rollup#get-started",
name: "Vistara",
ipfsImage: ipfsImages.logos.vistara,
height: "29px",
},
{
url: "https://movementlabs.xyz",
name: "Movement Labs",
ipfsImage: ipfsImages.logos.movementLabs,
height: "24px",
url: "https://www.zeeve.io/blog/zeeve-raas-partners-with-near-da-to-power-ethereum-rollup-builders-with-efficient-data-availability/",
name: "Zeeve",
ipfsImage: ipfsImages.logos.zeeve,
height: "29px",
},
];

const web3Teams = [
{
url: "https://polygon.technology/polygon-cdk",
name: "Polygon",
ipfsImage: ipfsImages.logos.polygon,
url: "https://docs.altlayer.io/altlayer-documentation/core-features-of-altlayers-in-house-rollup-stack/modular",
name: "Altlayer",
ipfsImage: ipfsImages.logos.altlayer,
height: "29px",
},
{
Expand All @@ -280,23 +274,29 @@ const web3Teams = [
height: "29px",
},
{
url: "https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/on-chain-data/",
name: "Starknet",
ipfsImage: ipfsImages.logos.starknet,
height: "29px",
url: "https://docs.caldera.xyz/about/alternative-da",
name: "Caldera",
ipfsImage: ipfsImages.logos.caldera,
height: "28px",
},
{
url: "https://docs.vistara.dev/rollups/create-a-rollup#get-started",
name: "Vistara",
ipfsImage: ipfsImages.logos.vistara,
height: "29px",
url: "https://docs.dymension.xyz/build/adv-guide/roller-adv/da-light-client",
name: "Dymension",
ipfsImage: ipfsImages.logos.dymension,
height: "28px",
},
{
url: "https://docs.altlayer.io/altlayer-documentation/core-features-of-altlayers-in-house-rollup-stack/modular",
name: "Altlayer",
ipfsImage: ipfsImages.logos.altlayer,
url: "https://docs.fluentlabs.xyz/learn/introduction/what-is-fluent#app-deployment-models",
name: "Fluent",
ipfsImage: ipfsImages.logos.fluent,
height: "29px",
},
{
url: "https://movementlabs.xyz",
name: "Movement Labs",
ipfsImage: ipfsImages.logos.movementLabs,
height: "24px",
},
];

return (
Expand Down Expand Up @@ -411,29 +411,42 @@ return (
</LogoText>

<LogoLinksWrapper>
<LogoLinksScroll>
<LogoLinks>
{web3Teams.map((team) => {
return (
<a
href={team.url}
target="_blank"
title={team.name}
style={{ height: team.height, display: "inline-block" }}
key={team.name}
>
<Widget
src="${REPL_MOB}/widget/Image"
props={{
image: returnIpfsImage(team.ipfsImage),
alt: team.name,
}}
/>
</a>
);
})}
</LogoLinks>
</LogoLinksScroll>
<LogoLinks>
{web3Teams.map((team) => {
return (
<a
href={team.url}
target="_blank"
title={team.name}
style={{ height: team.height, display: "inline-block" }}
key={team.name}
>
<Widget
src="${REPL_MOB}/widget/Image"
props={{
image: returnIpfsImage(team.ipfsImage),
alt: team.name,
}}
/>
</a>
);
})}
</LogoLinks>
<LogoLinks>
{web3Teams2.map((team) => {
return (
<a href={team.url} target="_blank" title={team.name} style={{ height: team.height }} key={team.name}>
<Widget
src="${REPL_MOB}/widget/Image"
props={{
image: returnIpfsImage(team.ipfsImage),
alt: team.name,
}}
/>
</a>
);
})}
</LogoLinks>
</LogoLinksWrapper>
{/* </Teams> */}
</Section>
Expand Down
8 changes: 0 additions & 8 deletions src/NearOrg/Ecosystem/OverviewPage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -403,14 +403,6 @@ const nearHubsCards = [
href: "https://nearvietnamhub.org",
hrefText: "Visit NEAR Vietman",
},
{
ipfsImage: ipfsImages.nearLogoIndia,
title: "NEAR India",
content:
"The NEAR India Hub provides resources and support for developers, entrepreneurs, and businesses in India who want to use or build on NEAR in India.",
href: "https://nearindiahub.com",
hrefText: "Visit NEAR India ",
},
];

return (
Expand Down
Loading

0 comments on commit c82f24c

Please sign in to comment.