Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Joe patch 006 #5174

Closed
wants to merge 6 commits into from
Closed
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
7 changes: 4 additions & 3 deletions apps/remix-ide/src/app/tabs/locales/en/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"home.learnMore": "Learn more",
"home.here": "more",
"home.featured": "Featured",
"home.jumpIntoWeb3": "JUMP INTO WEB3",
"home.jumpIntoWeb3More": "More",
"home.jumpIntoWeb3Text": "Remix IDE is part of the Remix Project, a rich toolset that can be used for the entire journey of contract development by users of any knowledge level. Learn more on the Remix Project website.",
"home.learnEthPromoTitle": "LearnEth: Tutorials inside Remix",
"home.learnEthPromoButton": "Start Learning",
"home.learnEthPromoText": "Check out tutorials on Remix, Solidity, and other Web3 projects. Great for all skill levels.",
"home.remixYouTube": "WATCH TO LEARN",
"home.remixYouTubeText1": "Video Tips from the Remix Team",
"home.remixYouTubeMore": "Watch",
Expand Down Expand Up @@ -37,6 +37,7 @@
"home.ozerc1155TemplateDesc": "Create an ERC1155 token by importing OpenZeppelin library.",
"home.gnosisSafeMultisigTemplateDesc": "Create Multi-Signature wallets using this template.",
"home.zeroxErc20TemplateDesc": "Create an ERC20 token by importing 0xProject contract.",
"home.learnEthPluginDesc": "Learn about Remix, Solidity, and other Web3 projects.",
"home.learn": "Learn",
"home.learnEth1": "Remix Basics",
"home.learnEth1Desc": "An introduction to Remix's interface and basic operations.",
Expand Down
Binary file added apps/remix-ide/src/assets/img/remi-prof.webp
Binary file not shown.
14 changes: 13 additions & 1 deletion apps/remix-ide/src/assets/list.json
Original file line number Diff line number Diff line change
Expand Up @@ -1022,9 +1022,21 @@
"urls": [
"dweb:/ipfs/QmS5JdeXtYhGBvdgNTLWuBNHupyP623X4sf43fRbrgiTaA"
]
},
{
"path": "soljson-v0.8.27+commit.40a35a09.js",
"version": "0.8.27",
"build": "commit.40a35a09",
"longVersion": "0.8.27+commit.40a35a09",
"keccak256": "0x68c7a06651a847fc9a60886a6ba590a2b20d87f2d4f9570bf70fbb2b901e7713",
"sha256": "0xd91c08277f801321af4e80958015aea18b41c01d2c6a38310a23014485b0e51c",
"urls": [
"dweb:/ipfs/QmVTALD1WUQwRvEL19jgwrEFyBJMQmy9z32zvT6TAtYPY1"
]
}
],
"releases": {
"0.8.27": "soljson-v0.8.27+commit.40a35a09.js",
"0.8.26": "soljson-v0.8.26+commit.8a97fa7a.js",
"0.8.25": "soljson-v0.8.25+commit.b61c2a91.js",
"0.8.24": "soljson-v0.8.24+commit.e11b9ed9.js",
Expand Down Expand Up @@ -1119,5 +1131,5 @@
"0.4.0": "soljson-v0.4.0+commit.acd334c9.js",
"0.3.6": "soljson-v0.3.6+commit.3fc68da5.js"
},
"latestRelease": "0.8.26"
"latestRelease": "0.8.27"
}
26 changes: 16 additions & 10 deletions libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ import 'react-multi-carousel/lib/styles.css'
import * as releaseDetails from './../../../../../../releaseDetails.json'

const _paq = (window._paq = window._paq || []) // eslint-disable-line
export type HomeTabFeaturedProps = {
plugin: any
}

function HomeTabFeatured() {
function HomeTabFeatured(props:HomeTabFeaturedProps) {
const themeFilter = useContext(ThemeContext)

return (
Expand Down Expand Up @@ -64,23 +67,26 @@ function HomeTabFeatured() {
</div>
<div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
<a href="https://remix-project.org" target="__blank">
<img src={'assets/img/bgRemi_small.webp'} className="remixui_carouselImage" alt=""></img>
<img src={'assets/img/remi-prof.webp'} className="remixui_carouselImage" alt=""></img>
</a>
<div className="h6 w-50 p-2 pl-4 align-self-center" style={{ flex: '1' }}>
<h5>
<FormattedMessage id="home.jumpIntoWeb3" />
<FormattedMessage id="home.learnEthPromoTitle" />
</h5>
<div style={{ fontSize: '0.8rem', lineHeight: '1.25rem' }} className="mb-3">
<FormattedMessage id="home.jumpIntoWeb3Text" />
<FormattedMessage id="home.learnEthPromoText" />
</div>
<a
<span
className="remixui_home_text btn-sm btn-secondary mt-2 text-decoration-none mb-3"
onClick={() => _paq.push(['trackEvent', 'hometab', 'featuredSection', 'jumpIntoWeb3'])}
target="__blank"
href="https://remix-project.org/"
onClick={async () => {
await props.plugin.appManager.activatePlugin(['LearnEth', 'solidityUnitTesting'])
props.plugin.verticalIcons.select('LearnEth')
await props.plugin.call('LearnEth', 'home')
}
}
>
<FormattedMessage id="home.jumpIntoWeb3More" />
</a>
<FormattedMessage id="home.learnEthPromoButton" />
</span>
</div>
</div>
<div className="mr-1 pr-1 d-flex align-items-center justify-content-center h-100">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
plugin.verticalIcons.select('solidityStaticAnalysis')
_paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'solidityStaticAnalysis'])
}
const startSourceVerify = async () => {
await plugin.appManager.activatePlugin(['solidity', 'sourcify'])
plugin.verticalIcons.select('sourcify')
_paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'sourcify'])
const startLearnEth = async () => {
await plugin.appManager.activatePlugin(['LearnEth', 'solidity', 'solidityUnitTesting'])
plugin.verticalIcons.select('LearnEth')
_paq.push(['trackEvent', 'hometabActivate', 'userActivate', 'LearnEth'])
}
const startCookbook = async () => {
await plugin.appManager.activatePlugin(['cookbookdev'])
Expand Down Expand Up @@ -109,7 +109,7 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
}
}}
renderButtonGroupOutside={true}
ssr={true} // means to render carousel on server-side.
ssr={false} // means to render carousel on server-side.
keyBoardControl={true}
containerClass="carousel-container"
deviceType={'desktop'}
Expand All @@ -125,6 +125,16 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
remixMaintained={true}
callback={() => startCodeAnalyzer()}
/>
<PluginButton
imgPath="assets/img/learnEthLogo.webp"
envID="learnEthLogo"
envText="LearnEth Tutorials"
description={intl.formatMessage({
id: 'home.learnEthPluginDesc'
})}
remixMaintained={true}
callback={() => startLearnEth()}
/>
<PluginButton
imgPath="assets/img/cookbook.webp"
envID="cookbookLogo"
Expand All @@ -141,13 +151,6 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
remixMaintained={true}
callback={() => startSolidity()}
/>
<PluginButton
imgPath="assets/img/sourcifyNewLogo.webp"
envID="sourcifyLogo"
envText="Sourcify"
description={intl.formatMessage({ id: 'home.sourcifyPluginDesc' })}
callback={() => startSourceVerify()}
/>
<PluginButton
imgPath="assets/img/unitTesting.webp"
envID="sUTLogo"
Expand Down
2 changes: 1 addition & 1 deletion libs/remix-ui/home-tab/src/lib/remix-ui-home-tab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const RemixUiHomeTab = (props: RemixUiHomeTabProps) => {
</div>
<div className="pl-2 pr-3 justify-content-start d-flex flex-column" style={{ width: `${carouselWidth}%` }} id="remixUIHTRight">
<LanguageOptions plugin={plugin}/>
<HomeTabFeatured></HomeTabFeatured>
<HomeTabFeatured plugin={plugin}></HomeTabFeatured>
<HomeTabFeaturedPlugins plugin={plugin}></HomeTabFeaturedPlugins>
</div>
</div>
Expand Down
Loading