Skip to content

Commit

Permalink
Updates to coloring/layout and add timeout to host connect on login
Browse files Browse the repository at this point in the history
  • Loading branch information
mrmikeo committed Mar 22, 2023
1 parent 960b417 commit 9e4af2e
Show file tree
Hide file tree
Showing 16 changed files with 574 additions and 189 deletions.
6 changes: 5 additions & 1 deletion locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,5 +147,9 @@
"Word 22": "Word 22",
"Word 23": "Word 23",
"Word 24": "Word 24",
"Restore 12 Words Instead": "Restore 12 Words Instead"
"Restore 12 Words Instead": "Restore 12 Words Instead",
"Error: Unable to connect to node": "Error: Unable to connect to node",
"Sending Transaction Fee": "Sending Transaction Fee",
"Unable to connect to a node. Enter a node URL": "Unable to connect to a node. Enter a node URL",
"Logout": "Logout"
}
14 changes: 11 additions & 3 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,12 @@ function createWindow() {
width: 1100,
height: 600,
webPreferences: {
nodeIntegration: true,
contextIsolation: false
nodeIntegration: true,
contextIsolation: false,
enableRemoteModule: true,
},
icon: "./icons/png/1024x1024.png"
icon: "./icons/png/1024x1024.png",
titleBarStyle: 'hidden',
})

mainWindow.loadURL(`file://${__dirname}/views/login.twig`);
Expand Down Expand Up @@ -882,6 +884,12 @@ function doInitialLoad() {

let account = data.account;
let password = data.password;
let node = data.node;

if (node && node != '' && node != 'default')
{
selectedPeer = node;
}

return new Promise((resolve, reject) => {

Expand Down
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Pandanite-Wallet",
"version": "1.0.6",
"version": "1.0.7",
"description": "Electron Based Wallet for Pandanite",
"main": "main.js",
"scripts": {
Expand All @@ -23,7 +23,6 @@
"license": "CC0-1.0",
"dependencies": {
"@octokit/rest": "^19.0.4",
"pandanite-js": "git+https://github.com/pandanite-crypto/pandanite-js.git",
"big.js": "^6.2.1",
"bip39": "^3.0.4",
"bootstrap": "4.2.1",
Expand All @@ -34,25 +33,26 @@
"got": "^11.8.5",
"http": "0.0.1-security",
"i18n-2": "^0.7.3",
"jquery": "3.3.1",
"jquery": "^3.6.4",
"nedb-promises": "^6.1.0",
"pandanite-js": "git+https://github.com/pandanite-crypto/pandanite-js.git",
"popper.js": "^1.16.1",
"portfinder": "^1.0.32",
"qrcode": "^1.5.1",
"semver": "^7.3.7",
"v8-compile-cache": "^2.3.0"
},
"devDependencies": {
"@electron-forge/cli": "^6.0.4",
"@electron-forge/maker-deb": "^6.0.4",
"@electron-forge/maker-dmg": "^6.0.4",
"@electron-forge/maker-rpm": "^6.0.4",
"@electron-forge/maker-wix": "^6.0.4",
"@electron-forge/maker-zip": "^6.0.4",
"browser-sync": "2.26.3",
"@electron-forge/cli": "^6.0.5",
"@electron-forge/maker-deb": "^6.0.5",
"@electron-forge/maker-dmg": "^6.0.5",
"@electron-forge/maker-rpm": "^6.0.5",
"@electron-forge/maker-wix": "^6.0.5",
"@electron-forge/maker-zip": "^6.0.5",
"browser-sync": "^2.29.0",
"electron": "^7.3.3",
"electron-fix": "^1.1.3",
"gulp": "4.0.0"
"gulp": "^4.0.2"
},
"config": {
"forge": {
Expand Down
3 changes: 2 additions & 1 deletion renderer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//Make Node.js API calls in this file

const {
ipcRenderer
} = require("electron");
Expand Down Expand Up @@ -29,4 +30,4 @@ window.emitMessage = async function(method,data,cb) {
cb(value);
});

}
}
44 changes: 31 additions & 13 deletions static/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@
body {
font-size: 14px;
font-family: "Karla Regular",sans-serif;
color: #676b79;
color: #FFFFFF;
background-color: #191919;
min-height: 100vh;
-webkit-app-region: drag;
}

.container {
Expand All @@ -52,8 +54,8 @@ body {
width: 100%;
display: flex;
flex-wrap: wrap;
background: #fff;
margin: 20px;
background: #191919;
margin: 10px;
overflow: hidden;
position: relative;
z-index: 1;
Expand All @@ -65,7 +67,7 @@ body {
width: calc(100% - 40px);
display: flex;
flex-wrap: wrap;
background: #fff;
background: #191919;
margin: 20px;
overflow: hidden;
position: relative;
Expand Down Expand Up @@ -116,7 +118,7 @@ body {
.user-form:after {
position: absolute;
content: "";
background: url(./media/bamboo-bmb-logo.png);
background: url(./media/bigpanda.png); /* url(./media/bamboo-bmb-logo.png); */
background-repeat: no-repeat;
background-size: 440px;
left: 50%;
Expand All @@ -131,13 +133,23 @@ body {
top: -10px;
left: 15px;
background: #fff;
color: #000;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
padding-left:5px;
padding-right:5px;
}

.user-form2 .form-group label {
position: absolute;
top: -10px;
left: 15px;
background: #fff;
color: #000;
border-top-right-radius: 5px;
border-top-left-radius: 5px;
padding-left:5px;
padding-right:5px;
}

.form-top {
Expand All @@ -146,8 +158,9 @@ body {

.nimmu-user-sibmit-button {
width: 100%;
background: #1b236e;
border: 2px solid #1b236e;
background: #FED31F; /*#1b236e;*/
border: 2px solid #FED31F; /*#1b236e;*/
color: #000;
height: 50px;
line-height: 50px;
padding: 0;
Expand All @@ -158,9 +171,8 @@ body {
font-size: 16px;
text-transform: uppercase;
display: inline-block;
padding: 0 25px;
background: #fff;
color: #3b53db;
padding: 0 20px;
color: #FFF;
margin: 30px 0;
position: relative;
display: block;
Expand All @@ -173,7 +185,7 @@ body {
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
background: #3b53db;
background: #FFF;
height: 1px;
}

Expand All @@ -188,7 +200,8 @@ body {

color: #ccc;
border-bottom:0px;
font-size:18px;
font-size:14px;
border-bottom:4px solid #444;

}

Expand All @@ -207,7 +220,7 @@ body {
.navbar-brand.active {

color: #fff;
border-bottom:5px solid #F9D951;
border-bottom:4px solid #F9D951;

}

Expand All @@ -217,3 +230,8 @@ body {

}

.swal-modal {
background-color: #000;
border: 1px solid #eee;
}

Binary file added static/media/bigpanda.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/media/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 9e4af2e

Please sign in to comment.