Skip to content

Commit 89998ba

Browse files
ircfspaceircfspace
committed
تغییر نحوه انتخاب متد اتصال
1 parent 4f3ebe2 commit 89998ba

File tree

6 files changed

+145
-72
lines changed

6 files changed

+145
-72
lines changed

‎assets/css/style.css

+53-4
Original file line numberDiff line numberDiff line change
@@ -449,6 +449,21 @@ nav .navMenu .indicator {
449449
height: 100vh;
450450
}
451451

452+
.settings .grouped {
453+
float: right;
454+
width: 100%;
455+
}
456+
457+
.settings .grouped .item {
458+
border-bottom: none;
459+
padding-bottom: 0;
460+
}
461+
462+
.settings .grouped .item:last-child {
463+
border-bottom: 1px solid #dcdcdc;
464+
padding-bottom: 15px;
465+
}
466+
452467
.settings .item {
453468
float: right;
454469
width: 100%;
@@ -549,6 +564,13 @@ nav .navMenu .indicator {
549564
color: #666666;
550565
}
551566

567+
.settings .item .value i {
568+
float: left;
569+
font-size: 28px;
570+
cursor: pointer;
571+
color: #FFA200;
572+
}
573+
552574
.settings .item .value .checkbox {
553575
float: left;
554576
border: 3px solid #A1A1A1;
@@ -566,7 +588,8 @@ nav .navMenu .indicator {
566588
border-color: #DCDCDC;
567589
}
568590

569-
.settings .item.disabled .value .checkbox {
591+
.settings .item.disabled .value .checkbox,
592+
.settings .item.disabled .value .checkbox i {
570593
cursor: default;
571594
}
572595

@@ -590,11 +613,37 @@ nav .navMenu .indicator {
590613
rotate: 0deg;
591614
}
592615

593-
.settings .item .value i {
616+
.settings .item .value .switch {
594617
float: left;
595-
font-size: 28px;
618+
border: 3px solid #A1A1A1;
619+
background: transparent;
620+
width: 27px;
621+
height: 27px;
622+
border-radius: 50%;
623+
padding: 0;
624+
margin: 2px 0 -1px 0;
596625
cursor: pointer;
597-
color: #FFA200;
626+
transition: all 0.2s ease-in-out;
627+
}
628+
629+
[data-bs-theme="dark"] .settings .item .value .switch {
630+
border-color: #DCDCDC;
631+
}
632+
633+
.settings .item .value .switch.checked {
634+
position: relative;
635+
border-color: #FFA200;
636+
}
637+
638+
.settings .item .value .switch.checked:after {
639+
position: absolute;
640+
content: "";
641+
top: 5px;
642+
right: 5px;
643+
width: 11px;
644+
height: 11px;
645+
background: #FFA200;
646+
border-radius: 50%;
598647
}
599648

600649
.settings .item .info {

‎src/defaultSettings.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,34 @@ export type settingsKeys =
33
| 'endpoint'
44
| 'ipType'
55
| 'port'
6-
| 'psiphon'
76
| 'location'
87
| 'license'
9-
| 'gool'
108
| 'theme'
119
| 'systemTray'
1210
| 'flag'
1311
| 'ipData'
1412
| 'routingRules'
1513
| 'autoSetProxy'
1614
| 'shareVPN'
17-
| 'hostIP';
15+
| 'hostIP'
16+
| 'method';
1817

1918
export const defaultSettings = {
2019
scan: true,
2120
endpoint: 'engage.cloudflareclient.com:2048',
2221
ipType: '',
2322
port: 8086,
24-
psiphon: false,
2523
location: '',
2624
license: '',
27-
gool: false,
2825
theme: 'light',
2926
systemTray: false,
3027
flag: 'xx',
3128
ipData: true,
3229
routingRules: '',
3330
autoSetProxy: true,
3431
shareVPN: false,
35-
hostIP: '127.0.0.1'
32+
hostIP: '127.0.0.1',
33+
method: 'gool'
3634
};
3735

3836
export const countries: { value: string; label: string }[] = [

‎src/main/ipcListeners/wp.ts

+15-13
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ ipcMain.on('wp-start', async (event, arg) => {
3333
const endpoint = await settings.get('endpoint');
3434
const ipType = await settings.get('ipType');
3535
const port = await settings.get('port');
36-
console.log('🚀 - ipcMain.on - port:', port);
37-
const psiphon = await settings.get('psiphon');
36+
//const psiphon = await settings.get('psiphon');
3837
const location = await settings.get('location');
3938
const license = await settings.get('license');
40-
const gool = await settings.get('gool');
39+
//const gool = await settings.get('gool');
40+
const method = await settings.get('method');
4141
const autoSetProxy = await settings.get('autoSetProxy');
4242
const hostIP = await settings.get('hostIP');
4343

@@ -60,16 +60,18 @@ ipcMain.on('wp-start', async (event, arg) => {
6060
args.push(license);
6161
}
6262
// gool or psiphon
63-
if (typeof gool === 'boolean' && gool) {
64-
args.push('--gool');
65-
} else if (typeof psiphon === 'boolean' && psiphon) {
66-
args.push(`--cfon`);
67-
if (typeof location === 'string' && location !== '') {
68-
args.push('--country');
69-
args.push(location);
70-
} else {
71-
args.push('--country');
72-
args.push(randomCountry());
63+
if (typeof method === 'string') {
64+
if (method === 'gool') {
65+
args.push('--gool');
66+
} else if (method === 'psiphon') {
67+
args.push(`--cfon`);
68+
if (typeof location === 'string' && location !== '') {
69+
args.push('--country');
70+
args.push(location);
71+
} else {
72+
args.push('--country');
73+
args.push(randomCountry());
74+
}
7375
}
7476
}
7577
// scan

‎src/renderer/components/Modal/Restore.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ export default function RestoreModal({
4545
// other settings
4646
//await settings.set('scan', defaultSettings.scan).then();
4747
await settings.set('endpoint', defaultSettings.endpoint).then();
48-
await settings.set('psiphon', defaultSettings.psiphon).then();
48+
//await settings.set('psiphon', defaultSettings.psiphon).then();
4949
await settings.set('location', defaultSettings.location).then();
5050
await settings.set('license', defaultSettings.license).then();
51-
await settings.set('gool', defaultSettings.gool).then();
51+
//await settings.set('gool', defaultSettings.gool).then();
52+
await settings.set('method', defaultSettings.method).then();
5253
await settings.set('hostIP', defaultSettings.hostIP).then();
5354
//
5455
ipcRenderer.sendMessage('wp-end');

‎src/renderer/lib/settings.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class settings {
3737
if (res.key === key) {
3838
resolve(res.value);
3939
} else {
40-
console.error('unmatched key event!', res.key, key);
40+
//console.error('unmatched key event!', res.key, key);
4141
}
4242
} catch (error) {
4343
console.error('settings - ipcRenderer.on - error:', error);

‎src/renderer/pages/Settings.tsx

+69-46
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ export default function Settings() {
1515
const [endpoint, setEndpoint] = useState();
1616
const [showEndpointModal, setShowEndpointModal] = useState(false);
1717
//const [ipType, setIpType] = useState<undefined | string>();
18-
const [psiphon, setPsiphon] = useState<undefined | boolean>();
18+
//const [psiphon, setPsiphon] = useState<undefined | boolean>();
1919
const [location, setLocation] = useState<undefined | string>();
2020
const [license, setLicense] = useState();
2121
const [showLicenseModal, setShowLicenseModal] = useState(false);
22-
const [gool, setGool] = useState<undefined | boolean>();
22+
//const [gool, setGool] = useState<undefined | boolean>();
23+
const [method, setMethod] = useState<undefined | string>('');
2324

2425
/*useEffect(() => {
2526
if (endpoint === '' || endpoint === defaultSettings.endpoint) {
@@ -37,26 +38,28 @@ export default function Settings() {
3738
/*settings.get('ipType').then((value) => {
3839
setIpType(typeof value === 'undefined' ? defaultSettings.ipType : value);
3940
});*/
40-
settings.get('psiphon').then((value) => {
41+
/*settings.get('psiphon').then((value) => {
4142
setPsiphon(typeof value === 'undefined' ? defaultSettings.psiphon : value);
42-
});
43+
});*/
4344
settings.get('location').then((value) => {
4445
setLocation(typeof value === 'undefined' ? defaultSettings.location : value);
4546
});
4647
settings.get('license').then((value) => {
4748
setLicense(typeof value === 'undefined' ? defaultSettings.license : value);
4849
});
49-
settings.get('gool').then((value) => {
50+
/*settings.get('gool').then((value) => {
5051
setGool(typeof value === 'undefined' ? defaultSettings.gool : value);
52+
});*/
53+
settings.get('method').then((value) => {
54+
setMethod(typeof value === 'undefined' ? defaultSettings.method : value);
5155
});
5256
}, []);
5357

5458
if (
5559
typeof endpoint === 'undefined' ||
56-
typeof psiphon === 'undefined' ||
5760
typeof location === 'undefined' ||
5861
typeof license === 'undefined' ||
59-
typeof gool === 'undefined'
62+
typeof method === 'undefined'
6063
)
6164
return (
6265
<>
@@ -131,51 +134,71 @@ export default function Settings() {
131134
</div>
132135
<div className='info'>برای اندپوینت تصادفی</div>
133136
</div>*/}
134-
<div
135-
className={classNames('item', psiphon ? 'disabled' : '')}
136-
onClick={() => {
137-
if (!psiphon) {
138-
setGool(!gool);
139-
settings.set('gool', !gool);
137+
<div className='grouped'>
138+
<div
139+
className={classNames(
140+
'item'
141+
)}
142+
onClick={() => {
143+
setMethod('');
144+
settings.set('method', '');
140145
settingsHaveChanged();
141-
}
142-
/*if (psiphon && !gool) {
143-
setPsiphon(false);
144-
settings.set('psiphon', false);
145-
}*/
146-
}}
147-
>
148-
<label className='key'>گول</label>
149-
<div className='value'>
150-
<div className={classNames('checkbox', gool ? 'checked' : '')}>
151-
<i className='material-icons'>&#xe876;</i>
146+
}}
147+
>
148+
<label className='key'>وارپ</label>
149+
<div className='value'>
150+
<div className={classNames('switch', method === '' ? 'checked' : '')} />
152151
</div>
152+
<div className='info'>فعالسازی Warp</div>
153153
</div>
154-
<div className='info'>فعالسازی WarpInWarp</div>
155-
</div>
156-
<div
157-
className={classNames('item', gool ? 'disabled' : '')}
158-
onClick={() => {
159-
if (!gool) {
160-
setPsiphon(!psiphon);
161-
settings.set('psiphon', !psiphon);
154+
<div
155+
className={classNames('item')}
156+
onClick={() => {
157+
setMethod('gool');
158+
settings.set('method', 'gool');
162159
settingsHaveChanged();
163-
}
164-
/*if (gool && !psiphon) {
165-
setGool(false);
166-
settings.set('gool', false);
167-
}*/
168-
}}
169-
>
170-
<label className='key'>سایفون </label>
171-
<div className='value'>
172-
<div className={classNames('checkbox', psiphon ? 'checked' : '')}>
173-
<i className='material-icons'>&#xe876;</i>
160+
/*if (!psiphon) {
161+
setGool(!gool);
162+
settings.set('gool', !gool);
163+
settingsHaveChanged();
164+
}*/
165+
/*if (psiphon && !gool) {
166+
setPsiphon(false);
167+
settings.set('psiphon', false);
168+
}*/
169+
}}
170+
>
171+
<label className='key'>گول</label>
172+
<div className='value'>
173+
<div className={classNames('switch', method === 'gool' ? 'checked' : '')} />
174+
</div>
175+
<div className='info'>فعالسازی WarpInWarp</div>
176+
</div>
177+
<div
178+
className={classNames('item')}
179+
onClick={() => {
180+
setMethod('psiphon');
181+
settings.set('method', 'psiphon');
182+
settingsHaveChanged();
183+
/*if (!gool) {
184+
setPsiphon(!psiphon);
185+
settings.set('psiphon', !psiphon);
186+
settingsHaveChanged();
187+
}*/
188+
/*if (gool && !psiphon) {
189+
setGool(false);
190+
settings.set('gool', false);
191+
}*/
192+
}}
193+
>
194+
<label className='key'>سایفون </label>
195+
<div className='value'>
196+
<div className={classNames('switch', method === 'psiphon' ? 'checked' : '')} />
174197
</div>
198+
<div className='info'>فعالسازی Psiphon</div>
175199
</div>
176-
<div className='info'>فعالسازی Psiphon</div>
177200
</div>
178-
<div className={classNames('item', psiphon ? '' : 'disabled')}>
201+
<div className={classNames('item', method === 'psiphon' ? '' : 'disabled')}>
179202
<label className='key'>انتخاب کشور</label>
180203
<div className='value'>
181204
<select
@@ -184,7 +207,7 @@ export default function Settings() {
184207
settings.set('location', e.target.value);
185208
settingsHaveChanged();
186209
}}
187-
disabled={!psiphon}
210+
disabled={method !== 'psiphon'}
188211
value={location}
189212
>
190213
<option value=''>Automatic</option>

0 commit comments

Comments
 (0)