Merge branch 'master' into statusbar-updates

pull/5370/head
Joseph Izang 5 months ago committed by GitHub
commit bc0cb04089
  1. 1
      apps/remix-ide/src/app/tabs/locales/en/terminal.json
  2. 1
      apps/remix-ide/src/app/tabs/locales/es/terminal.json
  3. 3
      apps/remix-ide/src/app/tabs/locales/fr/terminal.json
  4. 1
      apps/remix-ide/src/app/tabs/locales/it/terminal.json
  5. 1
      apps/remix-ide/src/app/tabs/locales/ko/terminal.json
  6. 1
      apps/remix-ide/src/app/tabs/locales/ru/terminal.json
  7. 1
      apps/remix-ide/src/app/tabs/locales/zh/terminal.json
  8. 2
      libs/remix-lib/package.json
  9. 1
      libs/remix-ui/app/src/lib/remix-app/style/remix-app.css
  10. 13
      libs/remix-ui/terminal/src/lib/components/Table.tsx

@ -40,5 +40,6 @@
"terminal.input": "input", "terminal.input": "input",
"terminal.decodedInput": "decoded input", "terminal.decodedInput": "decoded input",
"terminal.decodedOutput": "decoded output", "terminal.decodedOutput": "decoded output",
"terminal.rawlogs": "raw logs",
"terminal.logs": "logs" "terminal.logs": "logs"
} }

@ -39,5 +39,6 @@
"terminal.input": "entrada", "terminal.input": "entrada",
"terminal.decodedInput": "entrada descodificada", "terminal.decodedInput": "entrada descodificada",
"terminal.decodedOutput": "salida descodificada", "terminal.decodedOutput": "salida descodificada",
"terminal.rawlogs": "registros sin procesar",
"terminal.logs": "registros" "terminal.logs": "registros"
} }

@ -39,5 +39,6 @@
"terminal.input": "entrée", "terminal.input": "entrée",
"terminal.decodedInput": "entrée décodée", "terminal.decodedInput": "entrée décodée",
"terminal.decodedOutput": "sortie décodée", "terminal.decodedOutput": "sortie décodée",
"terminal.logs": "logs" "terminal.rawlogs": "logs bruts",
"terminal.logs": "Log"
} }

@ -39,5 +39,6 @@
"terminal.input": "input", "terminal.input": "input",
"terminal.decodedInput": "input decodificato", "terminal.decodedInput": "input decodificato",
"terminal.decodedOutput": "output decodificato", "terminal.decodedOutput": "output decodificato",
"terminal.rawlogs": "log grezzi",
"terminal.logs": "Log" "terminal.logs": "Log"
} }

@ -39,5 +39,6 @@
"terminal.input": "입력", "terminal.input": "입력",
"terminal.decodedInput": "디코드된 입력", "terminal.decodedInput": "디코드된 입력",
"terminal.decodedOutput": "디코드된 출력", "terminal.decodedOutput": "디코드된 출력",
"terminal.rawlogs": "원시 로그",
"terminal.logs": "로그" "terminal.logs": "로그"
} }

@ -39,5 +39,6 @@
"terminal.input": "ввод", "terminal.input": "ввод",
"terminal.decodedInput": "декодированный ввод", "terminal.decodedInput": "декодированный ввод",
"terminal.decodedOutput": "декодированный вывод", "terminal.decodedOutput": "декодированный вывод",
"terminal.rawlogs": "необработанные журналы",
"terminal.logs": "журналы" "terminal.logs": "журналы"
} }

@ -39,5 +39,6 @@
"terminal.input": "输入", "terminal.input": "输入",
"terminal.decodedInput": "解码输入", "terminal.decodedInput": "解码输入",
"terminal.decodedOutput": "解码输出", "terminal.decodedOutput": "解码输出",
"terminal.rawlogs": "原始日志",
"terminal.logs": "日志" "terminal.logs": "日志"
} }

@ -57,4 +57,4 @@
"typings": "src/index.d.ts", "typings": "src/index.d.ts",
"gitHead": "35e1469e94bb370f5427d4ab230fcbd47c665e55", "gitHead": "35e1469e94bb370f5427d4ab230fcbd47c665e55",
"types": "./src/index.d.ts" "types": "./src/index.d.ts"
} }

@ -43,6 +43,7 @@ pre {
.pinnedpanel { .pinnedpanel {
width : 320px; width : 320px;
transition : width 0.25s; transition : width 0.25s;
padding-bottom : 1.4rem;
} }
.highlightcode { .highlightcode {
position : absolute; position : absolute;

@ -188,7 +188,18 @@ const showTable = (opts, showTableHash) => {
<td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}> <td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
{JSON.stringify(stringified, null, '\t')} {JSON.stringify(stringified, null, '\t')}
<CopyToClipboard content={JSON.stringify(stringified, null, '\t')} /> <CopyToClipboard content={JSON.stringify(stringified, null, '\t')} />
<CopyToClipboard content={JSON.stringify(opts.logs.raw || '0')} /> <CopyToClipboard content={JSON.stringify(opts.logs.raw || '0', null, 2)} />
</td>
</tr>
) : null}
{opts.logs ? (
<tr className="remix_ui_terminal_tr">
<td className="remix_ui_terminal_td" data-shared={`key_${opts.hash}`}>
<FormattedMessage id="terminal.rawlogs" />
</td>
<td className="remix_ui_terminal_td" data-id={`txLoggerTableHash${opts.hash}`} data-shared={`pair_${opts.hash}`}>
<pre>{JSON.stringify(opts.logs.raw || '0', null, 2)}</pre>
<CopyToClipboard content={JSON.stringify(opts.logs.raw || '0', null, 2)} />
</td> </td>
</tr> </tr>
) : null} ) : null}

Loading…
Cancel
Save