diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js index a31bd34fc6..4c1d2e1d51 100644 --- a/apps/remix-ide/src/app.js +++ b/apps/remix-ide/src/app.js @@ -53,7 +53,8 @@ import { xtermPlugin } from './app/plugins/electron/xtermPlugin' import { ripgrepPlugin } from './app/plugins/electron/ripgrepPlugin' import { compilerLoaderPlugin, compilerLoaderPluginDesktop } from './app/plugins/electron/compilerLoaderPlugin' import { appUpdaterPlugin } from './app/plugins/electron/appUpdaterPlugin' -import { RemixAIPlugin, remixAIDesktopPlugin } from './app/plugins/electron/remixAIPlugin' +import { remixAIDesktopPlugin } from './app/plugins/electron/remixAIDesktopPlugin' +import { RemixAIPlugin } from './app/plugins/remixAIPlugin' import {SolCoder} from './app/plugins/solcoderAI' const isElectron = require('is-electron') @@ -367,12 +368,14 @@ class AppComponent { this.engine.register([ripgrep]) const appUpdater = new appUpdaterPlugin() this.engine.register([appUpdater]) + const remixAIDesktop = new remixAIDesktopPlugin() + this.engine.register([remixAIDesktop]) } const compilerloader = isElectron()? new compilerLoaderPluginDesktop(): new compilerLoaderPlugin() this.engine.register([compilerloader]) - const remixAI = isElectron()? new remixAIDesktopPlugin(): new RemixAIPlugin() + const remixAI = new RemixAIPlugin() this.engine.register([remixAI]) // LAYOUT & SYSTEM VIEWS @@ -494,7 +497,7 @@ class AppComponent { await this.appManager.activatePlugin(['solidity-script', 'remix-templates']) if (isElectron()){ - await this.appManager.activatePlugin(['isogit', 'electronconfig', 'electronTemplates', 'xterm', 'ripgrep', 'appUpdater']) + await this.appManager.activatePlugin(['isogit', 'electronconfig', 'electronTemplates', 'xterm', 'ripgrep', 'appUpdater', 'remixAID']) } this.appManager.on( diff --git a/apps/remix-ide/src/app/plugins/electron/remixAIPlugin.tsx b/apps/remix-ide/src/app/plugins/electron/remixAIPlugin.tsx deleted file mode 100644 index efe82b112a..0000000000 --- a/apps/remix-ide/src/app/plugins/electron/remixAIPlugin.tsx +++ /dev/null @@ -1,47 +0,0 @@ -import { ElectronPlugin } from '@remixproject/engine-electron' -import * as packageJson from '../../../../../../package.json' -import { ViewPlugin } from '@remixproject/engine-web' -import { Plugin } from '@remixproject/engine'; -import { RemixAITab } from '@remix-ui/remix-ai' -import React from 'react'; - -const profile = { - name: 'remixAI', - displayName: 'Remix AI', - methods: [''], - events: [], - icon: 'assets/img/remix-logo-blue.png', - description: 'Remix AI provides AI services to Remix IDE.', - kind: '', - location: 'sidePanel', - documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html', - version: packageJson.version, - maintainedBy: 'Remix' -} - -export class remixAIDesktopPlugin extends ElectronPlugin { - constructor() { - console.log('remixAIDesktopPlugin') - super(profile) - } - - onActivation(): void { - this.on('remixAI', 'enabled', () => {console.log('someone enable the remixAI desktop plugin')} ) - } -} - -export class RemixAIPlugin extends ViewPlugin { - constructor() { - console.log('remixAIPlugin') - super(profile) - } - - render() { - return ( -
- -
- ) - } -} - diff --git a/apps/remix-ide/src/app/tabs/search.tsx b/apps/remix-ide/src/app/tabs/search.tsx index 780ce49bb7..9bb0b246cb 100644 --- a/apps/remix-ide/src/app/tabs/search.tsx +++ b/apps/remix-ide/src/app/tabs/search.tsx @@ -4,7 +4,7 @@ import React from 'react' // eslint-disable-line import {SearchTab} from '@remix-ui/search' const profile = { name: 'search', - displayName: 'Search in files', + displayName: 'Searchi in files', methods: [''], events: [], icon: 'assets/img/search_icon.webp', diff --git a/apps/remixdesktop/src/engine.ts b/apps/remixdesktop/src/engine.ts index 516a90669f..1e138201a1 100644 --- a/apps/remixdesktop/src/engine.ts +++ b/apps/remixdesktop/src/engine.ts @@ -10,7 +10,7 @@ import { TemplatesPlugin } from './plugins/templates'; import { RipgrepPlugin } from './plugins/ripgrepPlugin'; import { CompilerLoaderPlugin } from './plugins/compilerLoader'; import { AppUpdaterPlugin } from './plugins/appUpdater'; -import { RemixAIPlugin } from './plugins/remixAIDektop'; +import { RemixAIDesktopPlugin } from './plugins/remixAIDektop'; const engine = new Engine() const appManager = new PluginManager() @@ -22,7 +22,7 @@ const templatesPlugin = new TemplatesPlugin() const ripgrepPlugin = new RipgrepPlugin() const compilerLoaderPlugin = new CompilerLoaderPlugin() const appUpdaterPlugin = new AppUpdaterPlugin() -const remixAIPlugin = new RemixAIPlugin() +const remixAIDesktopPlugin = new RemixAIDesktopPlugin() engine.register(appManager) engine.register(fsPlugin) @@ -33,7 +33,7 @@ engine.register(templatesPlugin) engine.register(ripgrepPlugin) engine.register(compilerLoaderPlugin) engine.register(appUpdaterPlugin) -engine.register(remixAIPlugin) +engine.register(remixAIDesktopPlugin) appManager.activatePlugin('electronconfig') appManager.activatePlugin('fs') diff --git a/apps/remixdesktop/src/plugins/remixAIDektop.ts b/apps/remixdesktop/src/plugins/remixAIDektop.ts index 7e15df760d..692526632b 100644 --- a/apps/remixdesktop/src/plugins/remixAIDektop.ts +++ b/apps/remixdesktop/src/plugins/remixAIDektop.ts @@ -4,23 +4,17 @@ import { app } from 'electron'; // import { isE2E } from "../main"; const profile = { - name: 'remixAI', - displayName: 'Remix AI', + name: 'remixAID', + displayName: 'Remix AI for desktops', methods: [''], - events: [], - icon: 'assets/img/remix-logo-blue.png', - description: 'Remix AI provides AI services to Remix IDE.', - kind: '', - location: 'sidePanel', - documentation: 'https://remix-ide.readthedocs.io/en/latest/remixai.html', - maintainedBy: 'Remix' + maintainedBy: 'Remix', } -export class RemixAIPlugin extends ElectronBasePlugin { - clients: RemixAIPluginClient[] = [] +export class RemixAIDesktopPlugin extends ElectronBasePlugin { + clients: RemixAIDesktopPluginClient[] = [] constructor() { console.log("loading the remix plugin") - super(profile, clientProfile, RemixAIPluginClient) + super(profile, clientProfile, RemixAIDesktopPluginClient) this.methods = [...super.methods] for (const client of this.clients) { @@ -31,15 +25,14 @@ export class RemixAIPlugin extends ElectronBasePlugin { } const clientProfile: Profile = { - name: 'remixAI', - displayName: 'remixAI', - description: 'remixAI', + name: 'remixAID', + displayName: 'remixAI for desktops', methods: ['enable'], + maintainedBy: 'Remix', } -class RemixAIPluginClient extends ElectronBasePluginClient { +class RemixAIDesktopPluginClient extends ElectronBasePluginClient { constructor (webContentsId: number, profile: Profile){ - console.log("loading the remix plugin client") console.log("loading the remix plugin client ........................") super(webContentsId, profile) } diff --git a/apps/remixdesktop/src/preload.ts b/apps/remixdesktop/src/preload.ts index 6bd25e6685..c8f8847be9 100644 --- a/apps/remixdesktop/src/preload.ts +++ b/apps/remixdesktop/src/preload.ts @@ -6,7 +6,7 @@ console.log('preload.ts', new Date().toLocaleTimeString()) /* preload script needs statically defined API for each plugin */ -const exposedPLugins = ['fs', 'git', 'xterm', 'isogit', 'electronconfig', 'electronTemplates', 'ripgrep', 'compilerloader', 'appUpdater', 'remixAI'] +const exposedPLugins = ['fs', 'git', 'xterm', 'isogit', 'electronconfig', 'electronTemplates', 'ripgrep', 'compilerloader', 'appUpdater', 'remixAID'] let webContentsId: number | undefined