From 8d6c8e08a53dc1655ea3112c726b6dc09a3f444f Mon Sep 17 00:00:00 2001 From: lianahus Date: Fri, 13 Sep 2024 10:55:26 +0200 Subject: [PATCH 01/12] cookbook last cell --- .../templates-selection-plugin.tsx | 16 ++++++++++++++-- .../grid-view/src/lib/remix-ui-grid-cell.tsx | 2 +- .../grid-view/src/lib/remix-ui-grid-section.tsx | 3 --- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx index 138ac3a7a4..712b1519fe 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx @@ -157,8 +157,6 @@ export class TemplatesSelectionPlugin extends ViewPlugin { key={template.name} title={template.name} tooltipTitle={template.tooltip} - onClick={template.onClick} - onClickLabel={template.onClickLabel} hScrollable={false} > {template.items.map(item => { @@ -214,6 +212,20 @@ export class TemplatesSelectionPlugin extends ViewPlugin { })} + { template.name === 'Cookbook' && +
+ Discover more templates! + template.onClick() }>{ template.onClickLabel } +
+ } })} diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx index 3055d0d4e7..96deee2398 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-cell.tsx @@ -47,7 +47,7 @@ export const RemixUIGridCell = (props: RemixUIGridCellProps) => { // check for filter if (filterCon.filter != '') enabled = (props.title?.toLowerCase().includes(filterCon.filter?.toLowerCase()) || - props.searchKeywords?.map(keyword => keyword.toLowerCase()).some(searchKeyword => searchKeyword.toLowerCase().includes(filterCon.filter.toLocaleLowerCase()))) + props.searchKeywords?.map(keyword => keyword?.toLowerCase()).some(searchKeyword => searchKeyword?.toLowerCase().includes(filterCon.filter?.toLocaleLowerCase()))) setAnyEnabled(enabled) }, [filterCon, props.tagList]) diff --git a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx index 5947db70b1..33fb25fb48 100644 --- a/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx +++ b/libs/remix-ui/grid-view/src/lib/remix-ui-grid-section.tsx @@ -14,8 +14,6 @@ const _paq = window._paq = window._paq || [] interface RemixUIGridSectionProps { plugin: any title?: string - onClick?: () => void - onClickLabel?: string tooltipTitle?: string hScrollable: boolean classList?: string @@ -67,7 +65,6 @@ export const RemixUIGridSection = (props: RemixUIGridSectionProps) => { >
{ props.title &&
{ props.title }
} - { props.onClick && props.onClick() }>{ props.onClickLabel } }
{ !hasChildCell(children) && No items found } { props.children } From 9b14b979f0ebd2802a48897ab73fb24480ee2694 Mon Sep 17 00:00:00 2001 From: lianahus Date: Fri, 13 Sep 2024 11:11:16 +0200 Subject: [PATCH 02/12] data moved outside --- .../plugins/templates-selection/templates-selection-plugin.tsx | 2 +- apps/remix-ide/src/app/plugins/templates-selection/templates.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx index 712b1519fe..7ff0e5559f 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates-selection-plugin.tsx @@ -222,7 +222,7 @@ export class TemplatesSelectionPlugin extends ViewPlugin { classList='TSCellStyle' >
- Discover more templates! + { template.description } template.onClick() }>{ template.onClickLabel }
} diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts index 1a70bcd906..3783044487 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts @@ -265,6 +265,7 @@ export const templates = (intl, plugin) => { plugin.call('menuicons', 'showContent', 'cookbookdev') }, onClickLabel: 'Open Cookbook Plugin', + description: 'Discover more templates!', items: [ { value: "token-sale", displayName: 'Token Sale' }, { value: "simple-nft-sale", displayName: 'Simple Nft Sale' }, From 4004f45ddf3a8605880873c583ad543ec8e0e830 Mon Sep 17 00:00:00 2001 From: lianahus Date: Wed, 11 Sep 2024 17:01:09 +0200 Subject: [PATCH 03/12] fixed updating moduls --- .../workspace/src/lib/remix-ui-workspace.tsx | 38 ++++++++++++------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 2e035ac018..d0040cb884 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1254,22 +1254,32 @@ export function Workspace() {
GIT
{ selectedWorkspace.hasGitSubmodules? - } - > +
- { global.fs.browser.isRequestingCloning ? : - } + { global.fs.browser.isRequestingCloning ? + + + : + } + > + + + }
- : null } Date: Thu, 12 Sep 2024 09:18:25 +0200 Subject: [PATCH 04/12] linting --- .../workspace/src/lib/remix-ui-workspace.tsx | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index d0040cb884..3b3acc4ecb 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -1254,32 +1254,32 @@ export function Workspace() {
GIT
{ selectedWorkspace.hasGitSubmodules? - -
- { global.fs.browser.isRequestingCloning ? - - - : - } - > - + : + } + > + - - } -
+ + + } +
: null } Date: Fri, 13 Sep 2024 12:13:44 +0200 Subject: [PATCH 05/12] refactor width updates --- .../src/app/components/vertical-icons.tsx | 7 ----- apps/remix-ide/src/app/panels/layout.ts | 23 ++++++++------- .../remix-app/components/dragbar/dragbar.tsx | 29 ++++++++++++------- .../app/src/lib/remix-app/remix-app.tsx | 16 ++++++++++ 4 files changed, 47 insertions(+), 28 deletions(-) diff --git a/apps/remix-ide/src/app/components/vertical-icons.tsx b/apps/remix-ide/src/app/components/vertical-icons.tsx index eb5ea60863..865c4fa468 100644 --- a/apps/remix-ide/src/app/components/vertical-icons.tsx +++ b/apps/remix-ide/src/app/components/vertical-icons.tsx @@ -16,8 +16,6 @@ const profile = { events: ['toggleContent', 'showContent'] } -const toMaximize = ['LearnEth'] - export class VerticalIcons extends Plugin { events: EventEmitter htmlElement: HTMLDivElement @@ -128,11 +126,6 @@ export class VerticalIcons extends Plugin { // TODO: Only keep `this.emit` (issue#2210) this.emit('showContent', name) this.events.emit('showContent', name) - if (toMaximize.includes(name)) { - setTimeout(_ => { - this.call('layout', 'maximiseSidePanel') - }, 500) - } } /** diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts index 51149c3859..c96f7ffc52 100644 --- a/apps/remix-ide/src/app/panels/layout.ts +++ b/apps/remix-ide/src/app/panels/layout.ts @@ -30,11 +30,12 @@ export type PanelConfiguration = { export class Layout extends Plugin { event: any panels: panels - maximised: { [key: string]: boolean } + enhanced: { [key: string]: boolean } constructor () { super(profile) - this.maximised = { - 'dgit': true + this.enhanced = { + 'dgit': true, + 'LearnEth': true } this.event = new EventEmitter() } @@ -80,8 +81,8 @@ export class Layout extends Plugin { }) this.on('sidePanel', 'focusChanged', async (name) => { const current = await this.call('sidePanel', 'currentFocus') - if (this.maximised[current]) { - this.event.emit('maximisesidepanel') + if (this.enhanced[current]) { + this.event.emit('enhancesidepanel') } else { this.event.emit('resetsidepanel') } @@ -89,8 +90,8 @@ export class Layout extends Plugin { this.on('pinnedPanel', 'pinnedPlugin', async (name) => { const current = await this.call('pinnedPanel', 'currentFocus') - if (this.maximised[current]) { - this.event.emit('maximisepinnedpanel') + if (this.enhanced[current]) { + this.event.emit('enhancepinnedpanel') } else { this.event.emit('resetpinnedpanel') } @@ -128,13 +129,13 @@ export class Layout extends Plugin { async maximiseSidePanel () { const current = await this.call('sidePanel', 'currentFocus') - this.maximised[current] = true + this.enhanced[current] = true this.event.emit('maximisesidepanel') } async maximisePinnedPanel () { const current = await this.call('pinnedPanel', 'currentFocus') - this.maximised[current] = true + this.enhanced[current] = true this.event.emit('maximisepinnedpanel') } @@ -146,13 +147,13 @@ export class Layout extends Plugin { async resetSidePanel () { const current = await this.call('sidePanel', 'currentFocus') - this.maximised[current] = false + this.enhanced[current] = false this.event.emit('resetsidepanel') } async resetPinnedPanel () { const current = await this.call('pinnedPanel', 'currentFocus') - this.maximised[current] = false + this.enhanced[current] = false this.event.emit('resetpinnedpanel') } } diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx index 009cb410b6..e726050067 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx @@ -8,6 +8,7 @@ interface IRemixDragBarUi { hidden: boolean minWidth: number maximiseTrigger: number + enhanceTrigger: number resetTrigger: number layoutPosition: 'left' | 'right' } @@ -40,32 +41,40 @@ const DragBar = (props: IRemixDragBarUi) => { } }, [props.hidden, offset]) - useEffect(() => { - if (props.maximiseTrigger > 0) { - if (props.layoutPosition === 'left') { - const width = 0.4 * window.innerWidth + const triggerWidth = (maximiseTrigger, layoutPosition, refObject, coeff) => { + if (maximiseTrigger > 0) { + if (layoutPosition === 'left') { + const width = coeff * window.innerWidth - if (width > props.refObject.current.offsetWidth) { + if (width > refObject.current.offsetWidth) { props.refObject.current.style.width = width + 'px' setTimeout(() => { setDragBarPosX(offset + width) }, 300) } - } else if (props.layoutPosition === 'right') { - const width = 0.4 * window.innerWidth + } else if (layoutPosition === 'right') { + const width = coeff * window.innerWidth - if (width > props.refObject.current.offsetWidth) { - props.refObject.current.style.width = width + 'px' + if (width > refObject.current.offsetWidth) { + refObject.current.style.width = width + 'px' setTimeout(() => { setDragBarPosX(window.innerWidth - width) }, 300) } } } + } + + useEffect(() => { + triggerWidth(props.maximiseTrigger, props.layoutPosition, props.refObject, 0.4) }, [props.maximiseTrigger]) useEffect(() => { - if (props.maximiseTrigger > 0) { + triggerWidth(props.enhanceTrigger, props.layoutPosition, props.refObject, 0.25) + }, [props.enhanceTrigger]) + + useEffect(() => { + if (props.maximiseTrigger > 0 || props.enhanceTrigger) { if (props.layoutPosition === 'left') { props.refObject.current.style.width = initialWidth.current + 'px' setTimeout(() => { diff --git a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx index 07e57d5051..805f8f3407 100644 --- a/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/remix-app.tsx @@ -32,8 +32,10 @@ const RemixApp = (props: IRemixAppUi) => { const [hideSidePanel, setHideSidePanel] = useState(false) const [hidePinnedPanel, setHidePinnedPanel] = useState(true) const [maximiseLeftTrigger, setMaximiseLeftTrigger] = useState(0) + const [enhanceLeftTrigger, setEnhanceLeftTrigger] = useState(0) const [resetLeftTrigger, setResetLeftTrigger] = useState(0) const [maximiseRightTrigger, setMaximiseRightTrigger] = useState(0) + const [enhanceRightTrigger, setEnhanceRightTrigger] = useState(0) const [resetRightTrigger, setResetRightTrigger] = useState(0) const [online, setOnline] = useState(true) const [locale, setLocale] = useState<{ code: string; messages: any }>({ @@ -98,6 +100,12 @@ const RemixApp = (props: IRemixAppUi) => { }) }) + props.app.layout.event.on('enhancesidepanel', () => { + setEnhanceLeftTrigger((prev) => { + return prev + 1 + }) + }) + props.app.layout.event.on('resetsidepanel', () => { setResetLeftTrigger((prev) => { return prev + 1 @@ -110,6 +118,12 @@ const RemixApp = (props: IRemixAppUi) => { }) }) + props.app.layout.event.on('enhancepinnedpanel', () => { + setEnhanceRightTrigger((prev) => { + return prev + 1 + }) + }) + props.app.layout.event.on('resetpinnedpanel', () => { setResetRightTrigger((prev) => { return prev + 1 @@ -205,6 +219,7 @@ const RemixApp = (props: IRemixAppUi) => { {props.app.sidePanel.render()}
{ { !hidePinnedPanel && Date: Fri, 13 Sep 2024 14:26:18 +0200 Subject: [PATCH 06/12] fix maximized --- apps/remix-ide/src/app/panels/layout.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts index c96f7ffc52..f7060a237c 100644 --- a/apps/remix-ide/src/app/panels/layout.ts +++ b/apps/remix-ide/src/app/panels/layout.ts @@ -31,8 +31,10 @@ export class Layout extends Plugin { event: any panels: panels enhanced: { [key: string]: boolean } + maximized: { [key: string]: boolean } constructor () { super(profile) + this.maximized = {} this.enhanced = { 'dgit': true, 'LearnEth': true @@ -129,13 +131,13 @@ export class Layout extends Plugin { async maximiseSidePanel () { const current = await this.call('sidePanel', 'currentFocus') - this.enhanced[current] = true + this.maximized[current] = true this.event.emit('maximisesidepanel') } async maximisePinnedPanel () { const current = await this.call('pinnedPanel', 'currentFocus') - this.enhanced[current] = true + this.maximized[current] = true this.event.emit('maximisepinnedpanel') } From 23c1217183a2590b021fe094f4762e7d577721f6 Mon Sep 17 00:00:00 2001 From: yann300 Date: Mon, 16 Sep 2024 13:10:35 +0200 Subject: [PATCH 07/12] fix maximize panel --- apps/remix-ide/src/app/panels/layout.ts | 16 +++++++++++++-- .../remix-app/components/dragbar/dragbar.tsx | 20 ++++++++----------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/apps/remix-ide/src/app/panels/layout.ts b/apps/remix-ide/src/app/panels/layout.ts index f7060a237c..539a9b1c48 100644 --- a/apps/remix-ide/src/app/panels/layout.ts +++ b/apps/remix-ide/src/app/panels/layout.ts @@ -85,7 +85,13 @@ export class Layout extends Plugin { const current = await this.call('sidePanel', 'currentFocus') if (this.enhanced[current]) { this.event.emit('enhancesidepanel') - } else { + } + + if (this.maximized[current]) { + this.event.emit('maximisesidepanel') + } + + if (!this.enhanced[current] && !this.maximized[current]) { this.event.emit('resetsidepanel') } }) @@ -94,7 +100,13 @@ export class Layout extends Plugin { const current = await this.call('pinnedPanel', 'currentFocus') if (this.enhanced[current]) { this.event.emit('enhancepinnedpanel') - } else { + } + + if (this.maximized[current]) { + this.event.emit('maximisepinnedpanel') + } + + if (!this.enhanced[current] && !this.maximized[current]) { this.event.emit('resetpinnedpanel') } }) diff --git a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx index e726050067..7bab81df79 100644 --- a/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx +++ b/libs/remix-ui/app/src/lib/remix-app/components/dragbar/dragbar.tsx @@ -46,21 +46,17 @@ const DragBar = (props: IRemixDragBarUi) => { if (layoutPosition === 'left') { const width = coeff * window.innerWidth - if (width > refObject.current.offsetWidth) { - props.refObject.current.style.width = width + 'px' - setTimeout(() => { - setDragBarPosX(offset + width) - }, 300) - } + props.refObject.current.style.width = width + 'px' + setTimeout(() => { + setDragBarPosX(offset + width) + }, 300) } else if (layoutPosition === 'right') { const width = coeff * window.innerWidth - if (width > refObject.current.offsetWidth) { - refObject.current.style.width = width + 'px' - setTimeout(() => { - setDragBarPosX(window.innerWidth - width) - }, 300) - } + refObject.current.style.width = width + 'px' + setTimeout(() => { + setDragBarPosX(window.innerWidth - width) + }, 300) } } } From 2c0b4318ff6e7ccedc9244afd39a5e021d16cb98 Mon Sep 17 00:00:00 2001 From: lianahus Date: Mon, 16 Sep 2024 13:54:27 +0200 Subject: [PATCH 08/12] pointer on sign in --- libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx index 3b3acc4ecb..a7bf75cb4a 100644 --- a/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx +++ b/libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx @@ -987,7 +987,7 @@ export function Workspace() { } - + { (!appContext.appState.gitHubUser || !appContext.appState.gitHubUser.isConnected) &&
logInGithub() } className="fa-brands fa-github-alt ml-2 align-self-center" style={{ fontSize: '1.1rem', cursor: 'pointer' }} aria-hidden="true"> - logInGithub() } className="ml-1 style={{ cursor: 'pointer' }} "> Sign in + logInGithub() } className="ml-1"> Sign in
} From e9ac595c448d6e591dddb3b850b0112a0d307e44 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 16 Sep 2024 16:51:35 +0530 Subject: [PATCH 09/12] Minor updates --- apps/remix-ide/src/app/tabs/locales/en/filePanel.json | 4 ++-- libs/remix-ui/git/src/lib/gitactions.ts | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json index ae518d686f..6b02520e94 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/filePanel.json +++ b/apps/remix-ide/src/app/tabs/locales/en/filePanel.json @@ -12,7 +12,7 @@ "filePanel.restore": "Restore", "filePanel.name": "Name", "filePanel.save": "Save", - "filePanel.workspace.create": "Create Workspace using template", + "filePanel.workspace.create": "Create Workspace Using Template", "filePanel.workspace.createBlank": "Create Blank Workspace", "filePanel.workspace.create.desktop": "Create project in new folder", "filePanel.workspace.rename": "Rename Workspace", @@ -71,7 +71,7 @@ "filePanel.createNewFile": "Create new file", "filePanel.createNewFolder": "Create new folder", "filePanel.publishToGist": "Publish to Gist", - "filePanel.workspace.publishToGist": "Publish workspace to GitHub gist", + "filePanel.workspace.publishToGist": "Publish Workspace to GitHub Gist", "filePanel.uploadFile": "Open a File from your File System", "filePanel.uploadFolder": "Upload folder", "filePanel.updateGist": "Update Gist", diff --git a/libs/remix-ui/git/src/lib/gitactions.ts b/libs/remix-ui/git/src/lib/gitactions.ts index b884091d6b..a94273badd 100644 --- a/libs/remix-ui/git/src/lib/gitactions.ts +++ b/libs/remix-ui/git/src/lib/gitactions.ts @@ -99,7 +99,6 @@ export const getCommits = async (depth: number) => { } export const gitlog = async (depth: number) => { - console.log('gitlog start') dispatch(setLoading(true)) let commits = [] try { From 1513fb2c66df559090b725bcf28c04fab15cc902 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 16 Sep 2024 17:10:24 +0530 Subject: [PATCH 10/12] UUPS --- .../src/app/plugins/templates-selection/templates.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts index 3783044487..c5941d01aa 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts @@ -132,7 +132,7 @@ export const templates = (intl, plugin) => { { value: "ozerc20", displayName: "UUPS ERC20", - description: "UUSP ERC20 contract with:", + description: "UUPS ERC20 contract with:", opts: { upgradeable: 'uups', mintable: true @@ -142,7 +142,7 @@ export const templates = (intl, plugin) => { { value: "ozerc20", displayName: "UUPS ERC20", - description: "UUSP ERC20 contract with:", + description: "UUPS ERC20 contract with:", opts: { upgradeable: 'uups', mintable: true, @@ -153,7 +153,7 @@ export const templates = (intl, plugin) => { { value: "ozerc20", displayName: "UUPS ERC20", - description: "UUSP ERC20 contract with:", + description: "UUPS ERC20 contract with:", opts: { upgradeable: 'uups', mintable: true, From 5a05d25fedc9be5df821517fd7e4b86e691d7873 Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 16 Sep 2024 17:12:43 +0530 Subject: [PATCH 11/12] 0x --- apps/remix-ide/src/app/plugins/templates-selection/templates.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts index c5941d01aa..7382e7bf20 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts @@ -282,7 +282,7 @@ export const templates = (intl, plugin) => { ] }, { - name: "OxProject", + name: "0xProject", items: [ { value: "zeroxErc20", displayName: "ERC20", tagList: ["ERC20", "Solidity"], description: "A fungible token contract by 0xProject" } ] From bcf91669f4e4489ed757b10dcae940ed02f423bc Mon Sep 17 00:00:00 2001 From: aniket-engg Date: Mon, 16 Sep 2024 17:28:24 +0530 Subject: [PATCH 12/12] more text updates --- .../plugins/templates-selection/templates.ts | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts index 7382e7bf20..5bde8d57ef 100644 --- a/apps/remix-ide/src/app/plugins/templates-selection/templates.ts +++ b/apps/remix-ide/src/app/plugins/templates-selection/templates.ts @@ -47,13 +47,13 @@ export const templates = (intl, plugin) => { }, { value: "ozerc721", - displayName: "ERC721", + displayName: "ERC721 (NFT)", tagList: ["ERC721", "Solidity"], description: 'A simple non-fungible token (NFT) contract' }, { value: "ozerc721", - displayName: "ERC721", + displayName: "ERC721 (NFT)", description: "An ERC721 contract with:", tagList: ["Solidity", "ERC721"], opts: { @@ -163,7 +163,7 @@ export const templates = (intl, plugin) => { }, { value: "ozerc721", - displayName: "UUPS ERC721", + displayName: "UUPS ERC721 (NFT)", description: "A simple UUPS ERC721 contract", opts: { upgradeable: 'uups' @@ -172,7 +172,7 @@ export const templates = (intl, plugin) => { }, { value: "ozerc721", - displayName: "UUPS ERC721", + displayName: "UUPS ERC721 (NFT)", description: "UUPS ERC721 contract with:", opts: { upgradeable: 'uups', @@ -183,7 +183,7 @@ export const templates = (intl, plugin) => { { value: "ozerc721", displayName: "UUPS ERC721 (NFT)", - description: "Non-fungible Token Standard", + description: "UUPS ERC721 contract with:", opts: { upgradeable: 'uups', mintable: true, @@ -194,7 +194,7 @@ export const templates = (intl, plugin) => { { value: "ozerc721", displayName: "UUPS ERC721 (NFT)", - description: "UUPS ERC721 with: ", + description: "UUPS ERC721 contract with:", opts: { upgradeable: 'uups', mintable: true, @@ -290,7 +290,7 @@ export const templates = (intl, plugin) => { { name: "Gnosis Safe", items: [ - { value: "gnosisSafeMultisig", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.multiSigWallet' }), description: 'Deploy or customize the Gnosis Safe.' } + { value: "gnosisSafeMultisig", tagList: ["Solidity"], displayName: intl.formatMessage({ id: 'filePanel.multiSigWallet' }), description: 'Deploy or customize the Gnosis Safe MultiSig Wallet' } ] }, { @@ -317,12 +317,12 @@ export const templates = (intl, plugin) => { items: [ { value: "uniswapV4Template", displayName: intl.formatMessage({ id: 'filePanel.uniswapV4Template' }), - description: 'Use an Uniswap hook' + description: 'Use a Uniswap hook' }, { value: "breakthroughLabsUniswapv4Hooks", displayName: intl.formatMessage({ id: 'filePanel.breakthroughLabsUniswapv4Hooks' }), - description: 'Use an Uniswap hook developed by Breakthrough Labs' + description: 'Use a Uniswap hook developed by Breakthrough Labs' }, { value: "uniswapV4HookBookMultiSigSwapHook", @@ -353,25 +353,25 @@ export const templates = (intl, plugin) => { { value: "etherscanScripts", displayName: intl.formatMessage({ id: 'filePanel.addscriptetherscan' }), - description: 'Script for verifying a Contract in Etherscan.' + description: 'Script for verifying a Contract in Etherscan' }, ], }, { - name: 'Github Actions', + name: 'GitHub Actions', items: [ { value: "runJsTestAction", displayName: intl.formatMessage({ id: 'filePanel.tssoltestghaction' }), - description: 'A Mocha Chai test workflow in a GitHub CI.' + description: 'A Mocha Chai test workflow in a GitHub CI' }, { value: "runSolidityUnittestingAction", displayName: intl.formatMessage({ id: 'filePanel.solghaction' }), - description: 'Run a Solidity unit test workflow in a GitHub CI.' + description: 'Run a Solidity unit test workflow in a GitHub CI' }, { value: "runSlitherAction", displayName: intl.formatMessage({ id: 'filePanel.slitherghaction' }), - description: 'Run a Slither security analysis in a GitHub CI.' + description: 'Run a Slither security analysis in a GitHub CI' } ], IsArtefact: true