diff --git a/apps/circuit-compiler/src/app/components/container.tsx b/apps/circuit-compiler/src/app/components/container.tsx index f07af0ff35b..d56036e44db 100644 --- a/apps/circuit-compiler/src/app/components/container.tsx +++ b/apps/circuit-compiler/src/app/components/container.tsx @@ -15,9 +15,17 @@ import { PrimeValue } from '../types' export function Container () { const circuitApp = useContext(CircuitAppContext) - const showCompilerLicense = (message = 'License not available') => { - // @ts-ignore - circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message }) + const showCompilerLicense = async (message = 'License not available') => { + try { + const response = await fetch('https://raw.githubusercontent.com/iden3/circom/master/COPYING') + if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`) + const content = await response.text() + // @ts-ignore + circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message: content }) + } catch (e) { + // @ts-ignore + circuitApp.plugin.call('notification', 'modal', { id: 'modal_circuit_compiler_license', title: 'Compiler License', message }) + } } const handleVersionSelect = (version: string) => { @@ -57,7 +65,7 @@ export function Container () { { switch (e.data.status) { case 'initiate': - console.log(e.data) this.events.emit(e.data.status, e.data) // Model file start load: add a new progress item to the list. break; case 'progress': this.events.emit(e.data.status, e.data) - console.log(e.data) // Model file progress: update one of the progress items. break; case 'done': this.events.emit(e.data.status, e.data) - console.log(e.data) // Model file loaded: remove the progress item from the list. break; case 'ready': this.events.emit(e.data.status, e.data) - console.log(e.data) // Pipeline ready: the worker is ready to accept messages. break; case 'update': this.events.emit(e.data.status, e.data) - console.log(e.data) // Generation update: update the output text. break; case 'complete': - console.log(e.data) if (this.responses[e.data.id]) { if (this.current === e.data.id) { this.responses[e.data.id](null, e.data) @@ -67,8 +61,6 @@ export class SuggestionService { } delete this.responses[e.data.id] this.current = null - } else { - console.log('no callback for', e.data) } // Generation complete: re-enable the "Generate" button diff --git a/apps/remix-ide/src/app/tabs/locales/en/home.json b/apps/remix-ide/src/app/tabs/locales/en/home.json index bf51810b49a..020405292b3 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/home.json +++ b/apps/remix-ide/src/app/tabs/locales/en/home.json @@ -6,9 +6,9 @@ "home.learnMore": "Learn more", "home.here": "here", "home.featured": "Featured", - "home.jumpIntoWeb3": "WE NEED YOUR HELP", - "home.jumpIntoWeb3More": "Go to survey", - "home.jumpIntoWeb3Text": "Remixers... Have a spare moment? Please help us improve your Remix experience with this one-minute survey.", + "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.remixYouTube": "WATCH TO LEARN", "home.remixYouTubeText1": "Video Tips from the Remix Team", "home.remixYouTubeMore": "Watch", diff --git a/apps/remix-ide/src/app/tabs/locales/en/settings.json b/apps/remix-ide/src/app/tabs/locales/en/settings.json index d5496259a03..b290156eec3 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/settings.json +++ b/apps/remix-ide/src/app/tabs/locales/en/settings.json @@ -39,6 +39,6 @@ "settings.analyticsInRemix": "Analytics in Remix IDE", "settings.copilot": "Solidity copilot - Alpha", "settings.copilot.activate": "Load & Activate copilot", - "settings.copilot.max_new_tokens": "Maximum amount of new words to generate", + "settings.copilot.max_new_tokens": "Maximum number of words to generate", "settings.copilot.temperature": "Temperature" } diff --git a/apps/remix-ide/src/app/tabs/locales/es/home.json b/apps/remix-ide/src/app/tabs/locales/es/home.json index 0c5633def3e..5d0ab22fdd5 100644 --- a/apps/remix-ide/src/app/tabs/locales/es/home.json +++ b/apps/remix-ide/src/app/tabs/locales/es/home.json @@ -6,9 +6,9 @@ "home.learnMore": "Aprender más", "home.here": "aquí", "home.featured": "Destacado", - "home.jumpIntoWeb3": "NECESITAMOS TU AYUDA", - "home.jumpIntoWeb3More": "Ir a la encuesta", - "home.jumpIntoWeb3Text": "Remixers... ¿Tienes un momento libre? Por favor, ayúdanos a mejorar tu experiencia en Remix con esta encuesta de un minuto.", + "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.remixYouTube": "MIRA PARA APRENDER", "home.remixYouTubeText1": "Vídeo de consejos del equipo de Remix", "home.remixYouTubeMore": "Mirar", diff --git a/apps/remix-ide/src/app/tabs/locales/fr/home.json b/apps/remix-ide/src/app/tabs/locales/fr/home.json index cc838b00b7e..c6a4fc865c9 100644 --- a/apps/remix-ide/src/app/tabs/locales/fr/home.json +++ b/apps/remix-ide/src/app/tabs/locales/fr/home.json @@ -6,9 +6,9 @@ "home.learnMore": "En savoir plus", "home.here": "ici", "home.featured": "Recommandé", - "home.jumpIntoWeb3": "NOUS AVONS BESOINS DE VOTRE AIDE", - "home.jumpIntoWeb3More": "Accéder au sondage", - "home.jumpIntoWeb3Text": "Remixers... Vous avez un moment? Aidez-nous à améliorer votre expérience de remix avec cette enquête d'une minute.", + "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.remixYouTube": "REGARDER POUR APPRENDRE", "home.remixYouTubeText1": "Conseils vidéo de l'équipe de Remix", "home.remixYouTubeMore": "Regarder", diff --git a/apps/remix-ide/src/app/tabs/locales/it/home.json b/apps/remix-ide/src/app/tabs/locales/it/home.json index 04bef435f3b..1a4b73379df 100644 --- a/apps/remix-ide/src/app/tabs/locales/it/home.json +++ b/apps/remix-ide/src/app/tabs/locales/it/home.json @@ -6,9 +6,9 @@ "home.learnMore": "Scopri di più", "home.here": "qui", "home.featured": "In Evidenza", - "home.jumpIntoWeb3": "ABBIAMO BISOGNO DEL TUO AIUTO", - "home.jumpIntoWeb3More": "Vai al sondaggio", - "home.jumpIntoWeb3Text": "Remixers... Hai un momento libero? Aiutaci a migliorare la tua esperienza Remix con questo sondaggio di un minuto.", + "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.remixYouTube": "GUARDA PER IMPARARE", "home.remixYouTubeText1": "Video di Suggerimenti dal Team di Remix", "home.remixYouTubeMore": "Guarda", diff --git a/apps/remix-ide/src/app/tabs/locales/zh/home.json b/apps/remix-ide/src/app/tabs/locales/zh/home.json index 8612fbed1a9..40a658b2393 100644 --- a/apps/remix-ide/src/app/tabs/locales/zh/home.json +++ b/apps/remix-ide/src/app/tabs/locales/zh/home.json @@ -6,9 +6,9 @@ "home.learnMore": "了解更多", "home.here": "这里", "home.featured": "精选", - "home.jumpIntoWeb3": "我们需要你的帮助", - "home.jumpIntoWeb3More": "去填调查表", - "home.jumpIntoWeb3Text": "Remixers... 有空吗?请填写这份一分钟调查问卷,帮助我们改善您的 Remix 体验。", + "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.remixYouTube": "观看学习", "home.remixYouTubeText1": "来自 Remix 团队的视频小贴士", "home.remixYouTubeMore": "观看", diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js index 70f9e812919..ef3dda2982b 100644 --- a/apps/remix-ide/src/remixAppManager.js +++ b/apps/remix-ide/src/remixAppManager.js @@ -74,7 +74,9 @@ const requiredModules = [ // services + layout views + system views 'contractflattener', 'solidity-script', 'openaigpt', - 'home' + 'home', + 'doc-viewer', + 'doc-gen' ] // dependentModules shouldn't be manually activated (e.g hardhat is activated by remixd) diff --git a/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts b/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts index 0a3c17888db..56a3c9c61a1 100644 --- a/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts +++ b/libs/remix-ui/editor/src/lib/providers/inlineCompletionProvider.ts @@ -15,7 +15,6 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli async provideInlineCompletions(model: monacoTypes.editor.ITextModel, position: monacoTypes.Position, context: monacoTypes.languages.InlineCompletionContext, token: monacoTypes.CancellationToken): Promise> { if (context.selectedSuggestionInfo) { - console.log('return empty from provideInlineCompletions') return; } // get text before the position of the completion @@ -27,7 +26,6 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli }); if (!word.endsWith(' ') && !word.endsWith('\n') && !word.endsWith(';') && !word.endsWith('.')) { - console.log('not a trigger char') return; } @@ -40,13 +38,12 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli try { const split = word.split('\n') - if (!split.length) return + if (split.length < 2) return const ask = split[split.length - 2].trimStart() if (split[split.length - 1].trim() === '' && ask.startsWith('///')) { // use the code generation model const {data} = await axios.post('https://gpt-chat.remixproject.org/infer', {comment: ask.replace('///', '')}) const parsedData = JSON.parse(data).trimStart() - console.log('parsedData', parsedData) const item: monacoTypes.languages.InlineCompletion = { insertText: parsedData }; @@ -61,7 +58,6 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli // abort if there is a signal if (token.isCancellationRequested) { - console.log('aborted') return } @@ -81,7 +77,6 @@ export class RemixInLineCompletionProvider implements monacoTypes.languages.Inli // abort if there is a signal if (token.isCancellationRequested) { - console.log('aborted') return } return { diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx index d34028381ef..d24ee0fb93f 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabFeatured.tsx @@ -74,14 +74,14 @@ function HomeTabFeatured() {
-
+
_paq.push(['trackEvent', 'hometab', 'featuredSection', 'jumpIntoWeb3'])} target="__blank" - href="https://us8.list-manage.com/survey?u=5a84beb6d688fe180c0da482a&id=1148d10f8c" + href="https://remix-project.org/" > diff --git a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx index 4de6de41752..59e4c0241b7 100644 --- a/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx +++ b/libs/remix-ui/home-tab/src/lib/components/homeTabGetStarted.tsx @@ -71,10 +71,7 @@ function HomeTabGetStarted({plugin}: HomeTabGetStartedProps) { return (
diff --git a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx index a24a943d317..95e61604090 100644 --- a/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx +++ b/libs/remix-ui/settings/src/lib/remix-ui-settings.tsx @@ -144,7 +144,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => { }) const modalActivate: AppModal = { id: 'loadcopilotActivate', - title: 'Downloading Solidity copilot', + title: 'Download Solidity copilot', modalType: ModalTypes.default, okLabel: 'Close', message, @@ -466,7 +466,7 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
-