Skip to content
This repository has been archived by the owner on Jan 25, 2023. It is now read-only.

Commit

Permalink
Merge pull request #150 from sentinel-official/wg-integrated-ui
Browse files Browse the repository at this point in the history
  • Loading branch information
@fabulous345
fabulous345 committed May 13, 2019
2 parents 20955e5 + fd36682 commit 48335fc
Show file tree
Hide file tree
Showing 167 changed files with 8,921 additions and 1,043 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ wallet\ 2.0/release-builds/
wallet\ 2.0/package-lock.json
wallet\ 2.0/build/
wallet\ 2.0/keys/
wallet\ 2.0/privateKeyFile/
30 changes: 1 addition & 29 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion wallet 2.0/debian.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"lintianOverrides": [
"changelog-file-missing-in-native-package"
],
"depends": ["openvpn", "libgconf2-4", "gksu","shadowsocks-libev"]
"depends": ["openvpn", "libgconf2-4", "gksu","shadowsocks-libev", "wireguard"]
}
155 changes: 100 additions & 55 deletions wallet 2.0/electron.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ function windowManager() {
this.createWindow = () => {
if (process.platform === 'win32') screenHeight = 700;
else screenHeight = 672;
this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.11.1", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
this.window = new BrowserWindow({ title: "Sentinel Network - dVPN - alpha-0.1.2", resizable: false, maximizable: false, width: 1000, height: screenHeight, icon: './public/icon256x256.png' });
this.window.loadURL(url.format({
pathname: path.join(__dirname, 'build/index.html'),
protocol: 'file:',
slashes: true
}));
// this.window.loadURL('http://localhost:3000');

this.window.on('close', async (e) => {
let self = this;
Expand All @@ -49,6 +50,18 @@ function windowManager() {
}
showTmPrompt = true;
if (isTM === 'true') {
if (process.platform === 'linux'){
exec(`wg-quick down wg0`, async function (error, stdout, stderr) {
console.log("disconnecting local Wireguard...")
if (error) throw error;
else {
// removeItemsLocal();
// clearConfig();
cb(null);
}
});
}

isTMVPNConnected(function (isConnected) {
if (showTmPrompt && isConnected) {
// e.preventDefault();
Expand Down Expand Up @@ -88,6 +101,10 @@ function windowManager() {
app.quit();
}
})




} else {
isVPNConnected((isConnected) => {
if (process.platform === 'win32')
Expand Down Expand Up @@ -246,7 +263,7 @@ function stopVPN(cb) {
try {
var cmd;
if (vpnType === 'socks5')
cmd = 'net stop sentinelSocksv111 /f && taskkill /IM sentinel.exe /f'
cmd = 'net stop sentinelSocksv12 /f && taskkill /IM sentinel.exe /f'
else cmd = 'taskkill /IM openvpn.exe /f && taskkill /IM sentinel.exe /f';
let stdout = execSync(cmd)
if (stdout) cb(null);
Expand Down Expand Up @@ -355,58 +372,86 @@ app.on('ready', function () {
},
]
},
// {
// label: "Language",
// submenu: [
// {
// label: 'English', type: 'checkbox', checked: true, click() {
// m.items[1].submenu.items[0].checked = true;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// mainWindow.window.webContents.send('lang', 'en');
// }
// },
// {
// label: 'Japanese', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = true;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// mainWindow.window.webContents.send('lang', 'ja');
// }
// }, {
// label: 'Spanish', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = true;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// mainWindow.window.webContents.send('lang', 'es');
// }
// }, {
// label: 'Russian', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = true;
// m.items[1].submenu.items[4].checked = false;
// mainWindow.window.webContents.send('lang', 'ru');
// }
// },{
// label: 'Chinese', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = true;
// mainWindow.window.webContents.send('lang', 'zh');
// }
// },
// ]
// }
{
label: "Language",
submenu: [
{
label: 'English', type: 'checkbox', checked: true, click() {
m.items[1].submenu.items[0].checked = true;
m.items[1].submenu.items[1].checked = false;
m.items[1].submenu.items[2].checked = false;
m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = false;
mainWindow.window.webContents.send('lang', 'en');
}
// },
// {
// label: 'Japanese', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = true;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = false;
// mainWindow.window.webContents.send('lang', 'ja');
// }
// }, {
// label: 'Spanish', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = true;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = false;
// mainWindow.window.webContents.send('lang', 'es');
// }
}, {
label: 'Chinese', type: 'checkbox', checked: false, click() {
m.items[1].submenu.items[0].checked = false;
m.items[1].submenu.items[1].checked = true;
m.items[1].submenu.items[2].checked = false;
m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = true;
// m.items[1].submenu.items[5].checked = false;
mainWindow.window.webContents.send('lang', 'zh');
}
}, {
label: 'Russian', type: 'checkbox', checked: false, click() {
m.items[1].submenu.items[0].checked = false;
m.items[1].submenu.items[1].checked = false;
m.items[1].submenu.items[2].checked = true;
m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = false;
mainWindow.window.webContents.send('lang', 'ru');
}
},
{
label: 'Persian', type: 'checkbox', checked: false, click() {
m.items[1].submenu.items[0].checked = false;
m.items[1].submenu.items[1].checked = false;
m.items[1].submenu.items[2].checked = false;
m.items[1].submenu.items[3].checked = true;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = false;
mainWindow.window.webContents.send('lang', 'per');
}
},
// {
// label: 'Turkish', type: 'checkbox', checked: false, click() {
// m.items[1].submenu.items[0].checked = false;
// m.items[1].submenu.items[1].checked = false;
// m.items[1].submenu.items[2].checked = false;
// m.items[1].submenu.items[3].checked = false;
// m.items[1].submenu.items[4].checked = false;
// m.items[1].submenu.items[5].checked = true;
// mainWindow.window.webContents.send('lang', 'tu');
// }
// },
]
}
])
Menu.setApplicationMenu(m)
})
Expand All @@ -419,4 +464,4 @@ app.on('activate', () => {
if (mainWindow.window === null) {
mainWindow.createWindow();
}
});
});
2 changes: 1 addition & 1 deletion wallet 2.0/installers/windows/createinstaller.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller
const path = require('path')
const appVersion='0.11.1'
const appVersion='0.1.2'

getInstallerConfig()
.then(createWindowsInstaller)
Expand Down
13 changes: 9 additions & 4 deletions wallet 2.0/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Sentinel Network - dVPN Desktop Application",
"productName": "Sentinel",
"author": "Dev Team <devteam@sentinelgroup.io>",
"version": "0.11.1",
"version": "0.1.2",
"private": true,
"main": "electron.js",
"license": "MIT",
Expand All @@ -23,7 +23,12 @@
"material-ui-rating": "^2.0.0",
"moment": "^2.22.2",
"net-stat": "^2.0.1",
"node-notifier": "^5.3.0",
"path": "^0.12.7",
"react-countup": "^4.1.0",
"redux-thunk": "^2.3.0",
"rippl": "^1.1.0",
"ssh2": "^0.8.2",
"sudo-prompt": "^8.1.0",
"url": "^0.11.0"
},
Expand All @@ -32,10 +37,10 @@
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"package-mac": "electron-packager . sentinel --overwrite --asar --platform=darwin --arch=x64 --icon=public/icon256x256.ico --prune=true --out=release-builds --extra-resource=public/gaiacli",
"package-mac": "electron-packager . Sentinel --overwrite --asar --platform=darwin --arch=x64 --icon=public/icon256x256.ico --prune=true --out=release-builds --extra-resource=public/gaiacli",
"package-win": "electron-packager . sentinel --overwrite --asar --platform=win32 --icon=public/icon256x256.ico --prune=true --out=release-builds --win32metadata.CompanyName=Sentinel --win32metadata.FileDescription=\"Application for Sentinel\" --win32metadata.requested-execution-level=requireAdministrator --win32metadata.ProductName=\"Sentinel\"",
"package-linux": "electron-packager . sentinel --overwrite --asar --platform=linux --arch=x64 --icon=public/icon256x256.png --prune=true --out=release-builds",
"create-installer-mac": "electron-installer-dmg ./release-builds/sentinel-darwin-x64/sentinel.app sentinel-alpha-0.11.1 --out=release-builds --overwrite --icon=public/icon256x256.icns",
"create-installer-mac": "electron-installer-dmg ./release-builds/Sentinel-darwin-x64/Sentinel.app Sentinel-alpha-0.1.2 --out=release-builds --overwrite --icon=public/icon256x256.icns",
"create-installer-win": "node installers/windows/createinstaller.js",
"create-debian-installer": "electron-installer-debian --src release-builds/sentinel-linux-x64/ --arch amd64 --config debian.json"
},
Expand All @@ -47,7 +52,7 @@
"electron": "^1.8.7",
"electron-installer-debian": "^0.8.1",
"electron-installer-dmg": "^0.2.1",
"electron-packager": "^10.1.2",
"electron-packager": "^12.2.0",
"electron-reload": "^1.2.5",
"electron-winstaller": "^2.6.3",
"ethereumjs-tx": "^1.3.4",
Expand Down
2 changes: 1 addition & 1 deletion wallet 2.0/platform_utils/debian.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
"lintianOverrides": [
"changelog-file-missing-in-native-package"
],
"depends": ["openvpn", "libgconf2-4", "shadowsocks-libev"]
"depends": ["openvpn", "libgconf2-4", "shadowsocks-libev", "wireguard"]
}
1 change: 1 addition & 0 deletions wallet 2.0/privateKeyFile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yOwj5kWLe2pzDLEqIjwj/ofi5CFlGS7xKtpvxvWNl34=
Binary file modified wallet 2.0/public/gaiacli
View file
Binary file not shown.
5 changes: 3 additions & 2 deletions wallet 2.0/public/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@
</noscript>

<div id="root"></div>
<div id="home" style="background-color: #1e1e1e;height: 106vh; display: 'flex';
<!-- <div id="home" style="background-color: #1e1e1e;height: 106vh; display: 'flex';
justify-content: 'center'; align-items: 'center';flex-direction: 'column';margin-top:-6vh">
<img src='../src/Images/logo.jpeg' style=" width: 150px; height: 150px;" />
<p style="font-size: 40px; color: white ">Sentinel</p>
</div>
</div> -->
<div id="home"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.
Expand Down

0 comments on commit 48335fc

Please sign in to comment.