Skip to content

Commit bfbba68

Browse files
LianaHusLianaHus
authored
Merge pull request #5288 from ethereum/iconForMaintained
new color for Maintained by and adding external maintainers as an option
2 parents b6700e9 + e5e3c3b commit bfbba68

File tree

5 files changed

+62
-36
lines changed

5 files changed

+62
-36
lines changed

‎libs/remix-ui/home-tab/src/lib/components/homeTabFeaturedPlugins.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
122122
description={intl.formatMessage({
123123
id: 'home.codeAnalyizerPluginDesc'
124124
})}
125-
remixMaintained={true}
125+
maintainedBy='Remix'
126126
callback={() => startCodeAnalyzer()}
127127
/>
128128
<PluginButton
@@ -132,31 +132,31 @@ function HomeTabFeaturedPlugins({ plugin }: HomeTabFeaturedPluginsProps) {
132132
description={intl.formatMessage({
133133
id: 'home.learnEthPluginDesc'
134134
})}
135-
remixMaintained={true}
135+
maintainedBy='Remix'
136136
callback={() => startLearnEth()}
137137
/>
138138
<PluginButton
139139
imgPath="assets/img/cookbook.webp"
140140
envID="cookbookLogo"
141141
envText="Cookbook"
142142
description={intl.formatMessage({ id: 'home.cookbookDesc' })}
143-
remixMaintained={false}
143+
maintainedBy="Cookbook"
144144
callback={() => startCookbook()}
145145
/>
146146
<PluginButton
147147
imgPath="assets/img/solidityLogo.webp"
148148
envID="solidityLogo"
149149
envText="Solidity"
150150
description={intl.formatMessage({ id: 'home.solidityPluginDesc' })}
151-
remixMaintained={true}
151+
maintainedBy='Remix'
152152
callback={() => startSolidity()}
153153
/>
154154
<PluginButton
155155
imgPath="assets/img/unitTesting.webp"
156156
envID="sUTLogo"
157157
envText="Solidity unit testing"
158158
description={intl.formatMessage({ id: 'home.unitTestPluginDesc' })}
159-
remixMaintained={true}
159+
maintainedBy='Remix'
160160
callback={() => startSolidityUnitTesting()}
161161
/>
162162
</Carousel>

‎libs/remix-ui/home-tab/src/lib/components/pluginButton.tsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ interface PluginButtonProps {
1010
callback: any
1111
l2?: boolean
1212
description: string
13-
remixMaintained?: boolean
13+
maintainedBy?: string
1414
}
1515

16-
function PluginButton({ imgPath, envID, envText, callback, l2, description, remixMaintained }: PluginButtonProps) {
16+
function PluginButton({ imgPath, envID, envText, callback, l2, description, maintainedBy }: PluginButtonProps) {
1717
const themeFilter = useContext(ThemeContext)
1818

1919
return (
@@ -30,13 +30,17 @@ function PluginButton({ imgPath, envID, envText, callback, l2, description, remi
3030
</div>
3131
</button>
3232
{l2 && <label className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_l2Label">L2</label>}
33-
{remixMaintained ? (
33+
{ maintainedBy?.toLowerCase() === 'remix' ? (
3434
<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-by-remix" tooltipText={<FormattedMessage id="home.maintainedByRemix" />}>
3535
<i className="bg-light text-success mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel fas fa-check"></i>
36-
</CustomTooltip>)
37-
: (<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
38-
<i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel text-warning far fa-exclamation-circle"></i>
39-
</CustomTooltip>)
36+
</CustomTooltip>) :
37+
maintainedBy ?
38+
(<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={"Maintained by " + maintainedBy}>
39+
<i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel text-secondary far fa-exclamation-circle"></i>
40+
</CustomTooltip>)
41+
: (<CustomTooltip placement="bottom" tooltipId="overlay-tooltip-external" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
42+
<i aria-hidden="true" className="bg-light mx-1 px-1 mb-0 mx-2 position-absolute remixui_home_maintainedLabel text-secondary far fa-exclamation-circle"></i>
43+
</CustomTooltip>)
4044
}
4145
</div>
4246
)

‎libs/remix-ui/panel/src/lib/plugins/panel-header.tsx

+11-7
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,17 @@ const RemixUIPanelHeader = (props: RemixPanelProps) => {
4848
</h6>
4949
<div className="d-flex flex-row">
5050
<div className="d-flex flex-row">
51-
{plugin?.profile?.maintainedBy?.toLowerCase() === 'remix' ? (
52-
<CustomTooltip placement="auto-end" tooltipId="maintainedByTooltip" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="panel.maintainedByRemix" />}>
53-
<i aria-hidden="true" className="text-success mt-1 px-1 fas fa-check"></i>
54-
</CustomTooltip>)
55-
: (<CustomTooltip placement="auto-end" tooltipId="maintainedExternally" tooltipClasses="text-nowrap" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
56-
<i aria-hidden="true" className="mt-1 px-1 text-warning far fa-exclamation-circle"></i>
57-
</CustomTooltip>)
51+
{ plugin?.profile?.maintainedBy?.toLowerCase() === 'remix' ? (
52+
<CustomTooltip placement="auto" tooltipId="maintainedByTooltipRemix" tooltipText={<FormattedMessage id="home.maintainedByRemix" />}>
53+
<i className="text-success mt-1 px-1 fas fa-check"></i>
54+
</CustomTooltip>) :
55+
plugin?.profile?.maintainedBy ?
56+
(<CustomTooltip placement="auto" tooltipId={"maintainedByTooltip" + plugin?.profile?.maintainedBy} tooltipText={"Maintained by " + plugin?.profile?.maintainedBy}>
57+
<i aria-hidden="true" className="mt-1 px-1 text-secondary far fa-exclamation-circle"></i>
58+
</CustomTooltip>)
59+
: (<CustomTooltip placement="auto" tooltipId="maintainedByTooltipRemixUnknown" tooltipText={<FormattedMessage id="panel.maintainedExternally" />}>
60+
<i aria-hidden="true" className="mt-1 px-1 text-secondary far fa-exclamation-circle"></i>
61+
</CustomTooltip>)
5862
}
5963
</div>
6064
<div className="swapitHeaderInfoSection d-flex justify-content-between" data-id="swapitHeaderInfoSectionId" onClick={toggleClass}>

‎libs/remix-ui/plugin-manager/src/lib/components/ActivePluginCard.tsx

+17-8
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,23 @@ function ActivePluginCard({ profile, buttonText, deactivatePlugin }: PluginCardP
2626
>
2727
<i aria-hidden="true" className="px-1 text-success fas fa-check"></i>
2828
</CustomTooltip>)
29-
: (<CustomTooltip
30-
placement="right"
31-
tooltipId="pluginManagerActiveTitleExternally"
32-
tooltipClasses="text-nowrap"
33-
tooltipText={<FormattedMessage id="pluginManager.maintainedExternally" />}
34-
>
35-
<i aria-hidden="true" className="px-1 text-warning far fa-exclamation-circle"></i>
36-
</CustomTooltip>)
29+
: profile?.maintainedBy ? (
30+
<CustomTooltip
31+
placement="right"
32+
tooltipId="pluginManagerActiveTitleByRemix"
33+
tooltipClasses="text-nowrap"
34+
tooltipText={"Maintained by " + profile?.maintainedBy}
35+
>
36+
<i aria-hidden="true" className="px-1 text-secondary far fa-exclamation-circle"></i>
37+
</CustomTooltip>)
38+
: (<CustomTooltip
39+
placement="right"
40+
tooltipId="pluginManagerActiveTitleExternally"
41+
tooltipClasses="text-nowrap"
42+
tooltipText={<FormattedMessage id="pluginManager.maintainedExternally" />}
43+
>
44+
<i aria-hidden="true" className="px-1 text-secondary far fa-exclamation-circle"></i>
45+
</CustomTooltip>)
3746
}
3847
{profile.documentation && (
3948
<CustomTooltip

‎libs/remix-ui/plugin-manager/src/lib/components/InactivePluginCard.tsx

+18-9
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,29 @@ function InactivePluginCard({ profile, buttonText, activatePlugin }: PluginCardP
3737
{profile?.maintainedBy?.toLowerCase() == 'remix' ? (
3838
<CustomTooltip
3939
placement="right"
40-
tooltipId="pluginManagerInactiveTitleByRemix"
40+
tooltipId="pluginManagerActiveTitleByRemix"
4141
tooltipClasses="text-nowrap"
4242
tooltipText={<FormattedMessage id="pluginManager.maintainedByRemix" />}
4343
>
4444
<i aria-hidden="true" className="px-1 text-success fas fa-check"></i>
4545
</CustomTooltip>)
46-
: (<CustomTooltip
47-
placement="right"
48-
tooltipId="pluginManagerInactiveTitleExternally"
49-
tooltipClasses="text-nowrap"
50-
tooltipText={<FormattedMessage id="pluginManager.maintainedExternally" />}
51-
>
52-
<i aria-hidden="true" className="px-1 text-warning far fa-exclamation-circle"></i>
53-
</CustomTooltip>)
46+
: profile?.maintainedBy ? (
47+
<CustomTooltip
48+
placement="right"
49+
tooltipId="pluginManagerActiveTitleByRemix"
50+
tooltipClasses="text-nowrap"
51+
tooltipText={"Maintained by " + profile?.maintainedBy}
52+
>
53+
<i aria-hidden="true" className="px-1 text-secondary far fa-exclamation-circle"></i>
54+
</CustomTooltip>)
55+
: (<CustomTooltip
56+
placement="right"
57+
tooltipId="pluginManagerActiveTitleExternally"
58+
tooltipClasses="text-nowrap"
59+
tooltipText={<FormattedMessage id="pluginManager.maintainedExternally" />}
60+
>
61+
<i aria-hidden="true" className="px-1 text-secondary far fa-exclamation-circle"></i>
62+
</CustomTooltip>)
5463
}
5564
{profile.documentation && (
5665
<CustomTooltip

0 commit comments

Comments
 (0)