Skip to content

Commit

Permalink
update logo
Browse files Browse the repository at this point in the history
  • Loading branch information
thecrypt0hunter committed Sep 30, 2020
1 parent f2c3c43 commit 19381a3
Show file tree
Hide file tree
Showing 16 changed files with 124 additions and 21 deletions.
7 changes: 4 additions & 3 deletions StratisCore.UI/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "XDS-core",
"description": "Trustaking XDS Core Wallet",
"version": "1.0.8",
"version": "1.0.9",
"author": {
"name": "Trustaking Platform",
"email": "[email protected]"
Expand Down Expand Up @@ -57,6 +57,7 @@
},
"dependencies": {
"electron-context-menu": "0.11.0",
"fs-extra": "^9.0.1",
"ngx-pagination": "3.2.1",
"ngx-qrcode2": "0.0.9",
"npm": "^6.9.0"
Expand Down Expand Up @@ -86,12 +87,11 @@
"core-js": "2.6.5",
"electron": "4.1.1",
"electron-builder": "20.39.0",
"electron-builder-squirrel-windows": "^22.6.0",
"electron-reload": "1.4.0",
"electron-winstaller": "^4.0.0",
"http-server": "^0.11.1",
"jasmine-core": "3.3.0",
"jasmine-spec-reporter": "4.2.1",
"jquery": "1.9.1",
"karma": "^3.1.4",
"karma-chrome-launcher": "2.2.0",
"karma-coverage-istanbul-reporter": "2.0.5",
Expand All @@ -102,6 +102,7 @@
"ngx-electron": "2.1.1",
"node-sass": "4.11.0",
"npm-run-all": "4.1.5",
"popper.js": "^1.14.7",
"protractor": "5.4.2",
"rxjs": "6.4.0",
"ts-node": "8.0.3",
Expand Down
114 changes: 114 additions & 0 deletions StratisCore.UI/package.new
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
{
"name": "XDS-core",
"description": "Trustaking XDS Core Wallet",
"version": "1.0.9",
"author": {
"name": "Trustaking Platform",
"email": "[email protected]"
},
"license": "MIT",
"homepage": "https://trustaking.com",
"keywords": [
"trustaking.com",
"fullnode",
"ui",
"XDS",
"XDSplatform",
"core",
"bitcoin",
"angular",
"electron",
"typescript",
"scss",
"bootstrap"
],
"main": "main.js",
"private": true,
"scripts": {
"postinstall": "npm run postinstall:electron && electron-builder install-app-deps",
"postinstall:web": "node postinstall-web",
"postinstall:electron": "node postinstall",
"ng": "ng",
"ng:serve": "ng serve",
"ng:serve:web": "npm run postinstall:web && ng serve -o",
"start": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve",
"mainnet": "npm start",
"testnet": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve:testnet",
"sidechain": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve:sidechain",
"sidechain:testnet": "npm run postinstall:electron && npm-run-all -p ng:serve electron:serve:sidechain:testnet",
"build": "npm run postinstall:electron && npm run electron:serve-tsc && ng build",
"build:dev": "npm run build -- -c dev",
"build:prod": "npm run build -- -c production",
"build:styling": "node-sass --output-style expanded --source-map true --precision 6 ./src/scss/bootstrap.scss ./src/styles.css",
"electron:serve-tsc": "tsc -p tsconfig-serve.json",
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve",
"electron:serve:testnet": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve --testnet",
"electron:serve:sidechain": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve --sidechain",
"electron:serve:sidechain:testnet": "wait-on http-get://localhost:4200/ && npm run electron:serve-tsc && electron . --serve --sidechain --testnet",
"electron:local": "npm run build:prod && electron .",
"package:linux": "npm run build:prod && electron-builder build --linux",
"package:linuxarm": "npm run build:prod && electron-builder build --linux --armv7l",
"package:windows": "npm run build:prod && electron-builder build --windows",
"package:windows86": "npm run build:prod && electron-builder build --windows --ia32",
"package:windows64": "npm run build:prod && electron-builder build --windows --x64",
"package:mac": "npm run build:prod && electron-builder build --mac",
"test": "npm run postinstall:web && ng test",
"e2e": "npm run postinstall:web && ng e2e"
},
"dependencies": {
"@aspnet/signalr": "^1.1.4",
"electron-context-menu": "0.14.0",
"fs-extra": "^9.0.1",
"minimist": "^1.2.5",
"ngx-pagination": "4.1.0",
"ngx-qrcode2": "0.0.9",
"npm": "^6.9.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.13.9",
"@angular/animations": "8.2.3",
"@angular/cli": "8.3.0",
"@angular/common": "8.2.3",
"@angular/compiler": "8.2.3",
"@angular/compiler-cli": "8.2.3",
"@angular/core": "8.2.3",
"@angular/forms": "8.2.3",
"@angular/language-service": "8.2.3",
"@angular/platform-browser": "8.2.3",
"@angular/platform-browser-dynamic": "8.2.3",
"@angular/router": "8.2.3",
"@ng-bootstrap/ng-bootstrap": "5.1.0",
"@ngx-translate/core": "11.0.1",
"@ngx-translate/http-loader": "4.0.0",
"@types/jasmine": "3.3.16",
"@types/jasminewd2": "2.0.6",
"@types/node": "12.7.2",
"bootstrap": "4.3.1",
"codelyzer": "5.1.0",
"core-js": "3.2.1",
"electron": "6.0.4",
"electron-builder": "21.2.0",
"electron-reload": "1.5.0",
"electron-winstaller": "^4.0.1",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.2.0",
"karma-chrome-launcher": "3.1.0",
"karma-coverage-istanbul-reporter": "2.1.0",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.2",
"ngx-bootstrap": "5.1.1",
"ngx-clipboard": "12.2.1",
"ngx-electron": "2.1.1",
"node-sass": "^4.14.1",
"npm-run-all": "4.1.5",
"protractor": "5.4.2",
"rxjs": "6.5.2",
"ts-node": "8.3.0",
"tslint": "5.18.0",
"typescript": "3.5.3",
"wait-on": "3.3.0",
"webdriver-manager": "12.1.6",
"zone.js": "0.9.1"
}
}
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="GUI" class="container-fluid">
<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/setup/create/create.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="GUI" class="container-fluid">
<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="GUI" class="container-fluid">
<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="GUI" class="container-fluid">
<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/setup/setup.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<section id="GUI" class="container-fluid" style="background-image: url(./assets/images/intro.gif); background-size: cover; height: 100%;">
<div class="row justify-content-center">
<div class="col-12 bg-dark pt-2 pb-2 border-bottom">
<img src="./assets/images/logo.png" height="20" width="20" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<img src="./assets/images/logo.png" height="25" width="25" class="float-left mt-2"/> <h4 class="float-left mt-2"><b>&nbsp;Trustaking XDS Core Wallet</b></h4>
<h4 class="float-right mt-2">Secure Anonymous Messenger</h4>
</div>
</div>
Expand Down
Binary file removed StratisCore.UI/src/assets/images-old/icon-512x512.png
Binary file not shown.
Binary file removed StratisCore.UI/src/assets/images-old/icon-tray.png
Binary file not shown.
Binary file removed StratisCore.UI/src/assets/images-old/icon.icns
Binary file not shown.
Binary file removed StratisCore.UI/src/assets/images-old/icon.ico
Binary file not shown.
Binary file removed StratisCore.UI/src/assets/images-old/intro.gif
Binary file not shown.
11 changes: 0 additions & 11 deletions StratisCore.UI/src/assets/images-old/license_en.txt

This file was deleted.

1 change: 0 additions & 1 deletion StratisCore.UI/src/assets/images-old/loading.svg

This file was deleted.

Binary file removed StratisCore.UI/src/assets/images-old/logo.png
Binary file not shown.

0 comments on commit 19381a3

Please sign in to comment.