Skip to content

Commit 0c8d71d

Browse files
drafishdrafish
committed
move custom cors-proxy to settings
1 parent ce09558 commit 0c8d71d

File tree

8 files changed

+124
-50
lines changed

8 files changed

+124
-50
lines changed

‎apps/remix-ide/src/app/files/dgitProvider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class DGitProvider extends Plugin {
5959
}
6060

6161
async parseInput (input) {
62-
const corsproxy = await this.call('config', 'getAppParameter', 'corsproxy')
62+
const corsproxy = await this.call('config', 'getAppParameter', 'settings/corsproxy-url')
6363
const gitlabToken = await this.call('config', 'getAppParameter', 'settings/gitlab-token')
6464
return {
6565
corsProxy: corsproxy || 'https://corsproxy.remixproject.org/',

‎apps/remix-ide/src/app/tabs/locales/en/filePanel.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,6 @@
2222
"filePanel.workspace.clone": "Clone Git Repository",
2323
"filePanel.workspace.cloneMessage": "Please provide a valid git repository url.",
2424
"filePanel.workspace.enterGitUrl": "Enter git repository url",
25-
"filePanel.workspace.enterCorsproxyUrl": "Enter cors proxy url, default to be https://corsproxy.remixproject.org/",
26-
"filePanel.workspace.gitRepoUrl": "Git Repo Url:",
27-
"filePanel.workspace.corsProxyUrl": "Cors Proxy Url (Optional):",
28-
"filePanel.workspace.corsproxyText1": "Note: To run CorsProxy on your system, run:",
29-
"filePanel.workspace.corsproxyText2": "Note: Cors Proxy Url must be end with /, such as http://127.0.0.1:9999/",
30-
"filePanel.workspace.corsproxyText3": "For more info, visit: <a>CorsProxy Documentation</a>",
3125
"filePanel.workspace.switch": "Switch To Workspace",
3226
"filePanel.workspace.solghaction": "Adds a preset yml file to run solidity unit tests on github actions CI.",
3327
"filePanel.solghaction": "Solidity Test Workflow",

‎apps/remix-ide/src/app/tabs/locales/en/settings.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
"settings.email": "EMAIL",
3434
"settings.deleteGithubCredentials": "Delete Github Credentials",
3535
"settings.deleteGitlabCredentials": "Delete Gitlab Credentials",
36+
"settings.url": "URL",
37+
"settings.deleteCorsproxy": "Delete Cors Proxy",
38+
"settings.corsproxyTitle": "Cors Proxy for Git",
39+
"settings.corsproxyText": "Cors Proxy is used to proxy git requests, such as clone, push, pull etc. Follow the commands below to start your own service:",
40+
"settings.corsproxyText2": "Cors Proxy Url must be end with /, default to be https://corsproxy.remixproject.org/",
41+
"settings.corsproxyText3": "For more info, visit: <a>CorsProxy Documentation</a>",
3642
"settings.privateBeeAddress": "PRIVATE BEE ADDRESS",
3743
"settings.postageStampID": "POSTAGE STAMP ID",
3844
"settings.host": "HOST",

‎libs/remix-ui/settings/src/lib/corsproxy-settings.tsx

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import {CopyToClipboard} from '@remix-ui/clipboard'
2+
import {CustomTooltip} from '@remix-ui/helper'
3+
import React, {useEffect, useState} from 'react'
4+
import {FormattedMessage, useIntl} from 'react-intl'
5+
import {CorsproxySettingsProps} from '../types'
6+
7+
export function CorsproxySettings(props: CorsproxySettingsProps) {
8+
const [url, setUrl] = useState<string>('')
9+
const intl = useIntl()
10+
11+
useEffect(() => {
12+
if (props.config) {
13+
const url = props.config.get('settings/corsproxy-url') || 'https://corsproxy.remixproject.org/'
14+
15+
setUrl(url)
16+
}
17+
}, [props.config])
18+
19+
const handleChangeUrlState = (event) => {
20+
setUrl(event.target.value)
21+
}
22+
23+
const saveCorsproxy = () => {
24+
props.saveCorsproxy(url)
25+
}
26+
27+
const removeToken = () => {
28+
setUrl('')
29+
props.removeCorsproxy()
30+
}
31+
32+
return (
33+
<div className="border-top">
34+
<div className="card-body pt-3 pb-2">
35+
<h6 className="card-title">
36+
<FormattedMessage id="settings.corsproxyTitle" />
37+
</h6>
38+
<FormattedMessage id="settings.corsproxyText" />
39+
<div className="p-1 pl-3">
40+
<b>npm install -g @drafish/cors-proxy</b>
41+
</div>
42+
<div className="p-1 pl-3">
43+
<b>cors-proxy start</b>
44+
</div>
45+
<div className="pt-2">
46+
<FormattedMessage
47+
id="settings.corsproxyText2"
48+
/>
49+
</div>
50+
<div className="pt-2">
51+
<FormattedMessage
52+
id="settings.corsproxyText3"
53+
values={{
54+
a: (chunks) => (
55+
<a href="https://github.com/drafish/cors-proxy" target="_blank">
56+
{chunks}
57+
</a>
58+
)
59+
}}
60+
/>
61+
</div>
62+
63+
<div>
64+
<label className="pt-2 mb-0 pb-0">
65+
<FormattedMessage id="settings.url" />:
66+
</label>
67+
<div className="text-secondary mb-0 h6">
68+
<input id="corsproxy" data-id="settingsTabCorsproxy" type="text" className="form-control" onChange={(e) => handleChangeUrlState(e)} value={url} />
69+
<div className="d-flex justify-content-end pt-2">
70+
<input className="btn btn-sm btn-primary ml-2" id="savecorsproxy" data-id="settingsTabSaveCorsproxy" onClick={saveCorsproxy} value={intl.formatMessage({id: 'settings.save'})} type="button"></input>
71+
<CustomTooltip tooltipText={<FormattedMessage id="settings.deleteCorsproxy" />} tooltipClasses="text-nowrap" tooltipId="removecorsproxyTooltip" placement="top-start">
72+
<button className="btn btn-sm btn-secondary ml-2" id="removecorsproxy" data-id="settingsTabRemoveCorsproxy" onClick={removeToken}>
73+
<FormattedMessage id="settings.remove" />
74+
</button>
75+
</CustomTooltip>
76+
</div>
77+
</div>
78+
</div>
79+
</div>
80+
</div>
81+
)
82+
}

‎libs/remix-ui/settings/src/lib/remix-ui-settings.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import {
1515
useMatomoAnalytics,
1616
saveTokenToast,
1717
removeTokenToast,
18+
saveCorsproxyToast,
19+
removeCorsproxyToast,
1820
saveSwarmSettingsToast,
1921
saveIpfsSettingsToast,
2022
useAutoCompletion,
@@ -28,6 +30,7 @@ import {RemixUiLocaleModule, LocaleModule} from '@remix-ui/locale-module'
2830
import {FormattedMessage, useIntl} from 'react-intl'
2931
import {GithubSettings} from './github-settings'
3032
import {GitlabSettings} from './gitlab-settings'
33+
import {CorsproxySettings} from './corsproxy-settings'
3134
import {EtherscanSettings} from './etherscan-settings'
3235

3336
/* eslint-disable-next-line */
@@ -598,6 +601,15 @@ export const RemixUiSettings = (props: RemixUiSettingsProps) => {
598601
}}
599602
config={props.config}
600603
/>
604+
<CorsproxySettings
605+
saveCorsproxy={(url: string) => {
606+
saveCorsproxyToast(props.config, dispatchToast, url, 'corsproxy-url')
607+
}}
608+
removeCorsproxy={() => {
609+
removeCorsproxyToast(props.config, dispatchToast, 'corsproxy-url')
610+
}}
611+
config={props.config}
612+
/>
601613
<EtherscanSettings
602614
saveToken={(etherscanToken: string) => {
603615
saveTokenToast(props.config, dispatchToast, etherscanToken, 'etherscan-access-token')

‎libs/remix-ui/settings/src/lib/settingsAction.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,16 @@ export const removeTokenToast = (config, dispatch, key) => {
7474
dispatch({ type: 'removed', payload: { message: 'Credentials removed' } })
7575
}
7676

77+
export const saveCorsproxyToast = (config, dispatch, value, key) => {
78+
config.set('settings/' + key, value)
79+
dispatch({ type: 'save', payload: { message: 'Corsproxy updated' } })
80+
}
81+
82+
export const removeCorsproxyToast = (config, dispatch, key) => {
83+
config.set('settings/' + key, '')
84+
dispatch({ type: 'removed', payload: { message: 'Corsproxy removed' } })
85+
}
86+
7787
export const saveSwarmSettingsToast = (config, dispatch, privateBeeAddress, postageStampId) => {
7888
config.set('settings/swarm-private-bee-address', privateBeeAddress)
7989
config.set('settings/swarm-postage-stamp-id', postageStampId)

‎libs/remix-ui/settings/src/types/index.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@ export interface GithubSettingsProps {
1111
}
1212
}
1313

14+
export interface CorsproxySettingsProps {
15+
saveCorsproxy: (url: string) => void,
16+
removeCorsproxy: () => void,
17+
config: {
18+
exists: (key: string) => boolean,
19+
get: (key: string) => string,
20+
set: (key: string, content: string) => void,
21+
clear: () => void,
22+
getUnpersistedProperty: (key: string) => void,
23+
setUnpersistedProperty: (key: string, value: string) => void
24+
}
25+
}
26+
1427
export interface EtherscanSettingsProps {
1528
saveToken: (etherscanToken: string) => void,
1629
removeToken: () => void,

‎libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ export function Workspace() {
4444
const workspaceCreateTemplateInput = useRef()
4545
const intl = useIntl()
4646
const cloneUrlRef = useRef<HTMLInputElement>()
47-
const config = global.plugin.registry.get('config').api
48-
const corsproxyUrlRef = useRef<HTMLInputElement>()
4947
const initGitRepoRef = useRef<HTMLInputElement>()
5048
const filteredBranches = selectedWorkspace ? (selectedWorkspace.branches || []).filter((branch) => branch.name.includes(branchFilter) && branch.name !== 'HEAD').slice(0, 20) : []
5149
const currentBranch = selectedWorkspace ? selectedWorkspace.currentBranch : null
@@ -398,9 +396,6 @@ export function Workspace() {
398396
const handleTypingUrl = () => {
399397
const url = cloneUrlRef.current.value
400398

401-
const corsproxy = corsproxyUrlRef.current.value
402-
config.set('corsproxy', corsproxy)
403-
404399
if (url) {
405400
global.dispatchCloneRepository(url)
406401
} else {
@@ -875,7 +870,6 @@ export function Workspace() {
875870
const cloneModalMessage = () => {
876871
return (
877872
<>
878-
<div><FormattedMessage id="filePanel.workspace.gitRepoUrl" /></div>
879873
<input
880874
type="text"
881875
data-id="modalDialogCustomPromptTextClone"
@@ -885,43 +879,6 @@ export function Workspace() {
885879
ref={cloneUrlRef}
886880
className="form-control"
887881
/>
888-
<div className="pt-4"><FormattedMessage id="filePanel.workspace.corsProxyUrl" /></div>
889-
<input
890-
type="text"
891-
data-id="modalDialogCustomPromptTextCorsproxy"
892-
placeholder={intl.formatMessage({
893-
id: 'filePanel.workspace.enterCorsproxyUrl'
894-
})}
895-
ref={corsproxyUrlRef}
896-
defaultValue={config.get('corsproxy')}
897-
className="form-control"
898-
/>
899-
<div className="pt-2">
900-
<FormattedMessage id="filePanel.workspace.corsproxyText1" />
901-
<div className="p-1 pl-3">
902-
<b>npm install -g @drafish/cors-proxy</b>
903-
</div>
904-
<div className="p-1 pl-3">
905-
<b>cors-proxy start</b>
906-
</div>
907-
<div className="pt-2">
908-
<FormattedMessage
909-
id="filePanel.workspace.corsproxyText2"
910-
/>
911-
</div>
912-
<div className="pt-2">
913-
<FormattedMessage
914-
id="filePanel.workspace.corsproxyText3"
915-
values={{
916-
a: (chunks) => (
917-
<a href="https://github.com/drafish/cors-proxy" target="_blank">
918-
{chunks}
919-
</a>
920-
)
921-
}}
922-
/>
923-
</div>
924-
</div>
925882
</>
926883
)
927884
}

0 commit comments

Comments
 (0)