Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge main into release v1.0 #10

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7a32bdc
Import ban list file #4
everoddandeven Nov 13, 2024
546b810
Fix uncaught permission exception on upgrade/install daemon casuing m…
everoddandeven Nov 14, 2024
b1ed2e6
Fix ban list settings
everoddandeven Nov 14, 2024
b8e96a2
Upgrade dependencies
everoddandeven Nov 14, 2024
668078f
Fix windows zip extraction
everoddandeven Nov 14, 2024
f3218ea
Bump donations, add lint test badge
everoddandeven Nov 15, 2024
78cb7f2
Fix linux path discrimination and uncaught exeception in main process…
everoddandeven Nov 15, 2024
9063c27
Refactory, behavior consolidation and minor fixes
everoddandeven Nov 16, 2024
8e26cd6
Bring splash screen back
everoddandeven Nov 16, 2024
1cb9854
Add missing mining settings
everoddandeven Nov 16, 2024
357cddd
Update README
everoddandeven Nov 16, 2024
f2f112c
Fix templates, missing implementations, behavior improvement, update …
everoddandeven Nov 18, 2024
503c458
Update macos workflow
everoddandeven Nov 18, 2024
ce1af24
Improve alert info
everoddandeven Nov 18, 2024
fe18b16
Update README to do list
everoddandeven Nov 18, 2024
55c7cfd
Update README.md
everoddandeven Nov 26, 2024
f744dad
Fix daemon settings keys parsing #8
everoddandeven Dec 25, 2024
5717f2e
Fix enforceDnsCheckpointing
everoddandeven Dec 25, 2024
5813c56
Add igd/no igd setting
everoddandeven Dec 26, 2024
48b2875
fix ban list setting
everoddandeven Dec 26, 2024
ea840fa
Upgrade dependencies
everoddandeven Dec 26, 2024
827f2ff
Fix lint test
everoddandeven Dec 27, 2024
4d8487b
Priority and exclusive nodes setting implementation
everoddandeven Dec 28, 2024
b8dceec
Fixed difficulty setting implementation
everoddandeven Dec 28, 2024
13a4bb2
Fix negative time elapsed
everoddandeven Dec 28, 2024
a09c5b4
fix col size
everoddandeven Dec 28, 2024
bc882b0
Fix window tab scroll
everoddandeven Dec 28, 2024
829fc9d
Fix lint test
everoddandeven Dec 28, 2024
7e3d22d
Dynamic logs terminal size
everoddandeven Dec 29, 2024
64506dd
Fix template rows p size
everoddandeven Dec 29, 2024
5b9a509
Dont's scroll log to bottom when user is scrolling
everoddandeven Dec 29, 2024
a4799cc
Increase daemon stop check delay
everoddandeven Dec 29, 2024
406d4df
Fix lint
everoddandeven Dec 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
node-version: [20]

# The type of runner that the job will run on
runs-on: macos-12
runs-on: macos-13

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
main.js
src/**/*.js
app/auto-launch/**/*.js
app/process/**/*.js
app/utils/**/*.js
*.js.map

# dependencies
Expand Down
132 changes: 83 additions & 49 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c705f535eebe4ba8b7a5789f6b409933)](https://app.codacy.com/gh/everoddandeven/monerod-gui/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
[![Make a pull request][prs-badge]][prs]
[![License][license-badge]](LICENSE.md)
[![Lint Test](https://github.com/everoddandeven/monerod-gui/actions/workflows/lint.yml/badge.svg)](https://github.com/everoddandeven/monerod-gui/actions/workflows/lint.yml)

[![Linux - AppImage Build](https://github.com/everoddandeven/monerod-gui/actions/workflows/linux_appimage.yml/badge.svg)](https://github.com/everoddandeven/monerod-gui/actions/workflows/linux_appimage.yml)
[![Linux - x64 DEB Build](https://github.com/everoddandeven/monerod-gui/actions/workflows/linux_x64_deb.yml/badge.svg)](https://github.com/everoddandeven/monerod-gui/actions/workflows/linux_x64_deb.yml)
Expand All @@ -17,7 +18,7 @@
[![Watch on GitHub][github-watch-badge]][github-watch]
[![Star on GitHub][github-star-badge]][github-star]

[![XMR Donated](https://img.shields.io/badge/donated-0.188011974017_XMR-blue?logo=monero)](https://github.com/everoddandeven/monerod-gui?tab=readme-ov-file#monero)
[![XMR Donated](https://img.shields.io/badge/donated-8.757300489601_XMR-blue?logo=monero)](https://github.com/everoddandeven/monerod-gui?tab=readme-ov-file#monero)
[![BTC Donated][bitcoin-donated-badge]][bitcoin-donated]

</div>
Expand Down Expand Up @@ -74,7 +75,11 @@ https://github.com/user-attachments/assets/c4a50d2f-5bbb-48ac-9425-30ecc20ada7c

## To Do

- [X] Upgrade Electron to latest version
- [ ] Upgrade Angular to latest version
- [ ] Implement e2e tests
- [X] Detect wired/Wi-Fi connection
- [X] Detect battery/ac power
- [ ] Detect preinstalled `monerod`
- [ ] Linux
- [ ] Windows
Expand All @@ -83,14 +88,49 @@ https://github.com/user-attachments/assets/c4a50d2f-5bbb-48ac-9425-30ecc20ada7c
- [X] Linux
- [X] Windows
- [X] MacOS
- [X] Import/export `monerod.conf` node configuration
- [X] Synchronization in a specific time slot
- [X] Installers
- [X] Linux
- [X] Windows
- [X] MacOS
- [X] MacOS
- [ ] Packages
- [X] deb
- [X] rpm
- [X] exe
- [X] msi
- [X] dmg
- [ ] pkg
- [ ] flatpack
- [ ] snap
- [X] Import/export `monerod.conf` node configuration
- [X] Synchronization in a specific time slot
- [ ] Prompt user access control for administration operation
- [ ] Check for new versions of the GUI
- [ ] Wallet RPC management
- [ ] Blockchain tools
- [ ] Private testnet
- [ ] Import blockchain
- [ ] Export blockchain
- [ ] Prune blockchain
- [ ] Blockchain explorer
- [ ] Blockchain ancestry
- [ ] Blockchain stats
- [ ] Blockchain usage
- [ ] Blockchain depth
- [ ] Mining tools
- [ ] Calculator
- [ ] XMRig integration
- [ ] P2Pool integration
- [ ] Network tools
- [ ] Generate SSL certificate
- [ ] Tor integration
- [ ] I2P integration
- [ ] Automatic malicious node detection
- [ ] Remote node management
- [ ] No CORS connection
- [ ] SSH connection
- [ ] Move to Tauri
- [ ] Port and upgrade `battery-level` dependency
- [ ] Light Wallet Server integration

## Getting Started

Expand All @@ -108,13 +148,6 @@ npm install

There is an issue with `yarn` and `node_modules` when the application is built by the packager. Please use `npm` as dependencies manager.

If you want to generate Angular components with Angular-cli , you **MUST** install `@angular/cli` in npm global context.
Please follow [Angular-cli documentation](https://github.com/angular/angular-cli) if you had installed a previous version of `angular-cli`.

``` bash
npm install -g @angular/cli
```

*Install NodeJS dependencies with npm (used by Electron main process):*

``` bash
Expand All @@ -124,36 +157,37 @@ npm install

Why two package.json ? This project follow [Electron Builder two package.json structure](https://www.electron.build/tutorials/two-package-structure) in order to optimize final bundle and be still able to use Angular `ng add` feature.

## To build for development

- **in a terminal window** -> npm start

Voila! You can use your Angular + Electron app in a local development environment with hot reload!

The application code is managed by `app/main.ts`. In this sample, the app runs with a simple Angular App (`http://localhost:4200`), and an Electron window. \
The Angular component contains an example of Electron and NodeJS native lib import. \
You can disable "Developer Tools" by commenting `win.webContents.openDevTools();` in `app/main.ts`.

## Project structure

| Folder | Description |
|--------|--------------------------------------------------|
| app | Electron main process folder (NodeJS) |
| src | Electron renderer process folder (Web / Angular) |

## Browser mode
## To build for development

| Command | Description |
|------------------------------|-------------------------------------------------------------------------------------------------------|
| `npm run electron:local:dev` | Builds your application and start electron locally (DEV MODE) |

Maybe you only want to execute the application in the browser with hot reload? Just run `npm run ng:serve:web`.

## Included Commands
If you want to generate Angular components with Angular-cli , you **MUST** install `@angular/cli` in npm global context.
Please follow [Angular-cli documentation](https://github.com/angular/angular-cli) if you had installed a previous version of `angular-cli`.

``` bash
npm install -g @angular/cli
```

## To build for production

| Command | Description |
|------------------------------|-------------------------------------------------------------------------------------------------------|
| `npm run electron:local` | Builds your application and start electron locally |
| `npm run electron:build` | Builds your application and creates an app and installer for Windows |
| `npm run electron:build:deb` | Builds your application and creates an installer consumable for debian based operating systems |
| `npm run electron:build:rpm` | Builds your application and creates an installer consumable for redhat based operating systems |
| `npm run electron:build:mac` | Builds your application and creates an installer consumable for MacOS |

| Command | Description |
|--------------------------|-------------------------------------------------------------------------------------------------------|
| `npm run ng:serve` | Execute the app in the web browser (DEV mode) |
| `npm run web:build` | Build the app that can be used directly in the web browser. Your built files are in the /dist folder. |
| `npm run electron:local` | Builds your application and start electron locally |
| `npm run electron:local:dev` | Builds your application and start electron locally (DEV MODE) |
| `npm run electron:build` | Builds your application and creates an app consumable based on your operating system |

**Your application is optimised. Only /dist folder and NodeJS dependencies are included in the final bundle.**

Expand All @@ -178,24 +212,6 @@ Finally from VsCode press **Ctrl+Shift+D** and select **Application Debug** and

Please note that Hot reload is only available in Renderer process.

[maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
[prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg
[prs]: http://makeapullrequest.com

[macos-build-badge]: https://github.com/everoddandeven/monerod-gui/workflows/MacOS%20Build/badge.svg
[macos-build]: https://github.com/everoddandeven/monerod-gui/actions?query=workflow%3A%22MacOS+Build%22
[windows-build-badge]: https://github.com/everoddandeven/monerod-gui/workflows/Windows%20Build/badge.svg
[windows-build]: https://github.com/everoddandeven/monerod-gui/actions?query=workflow%3A%22Windows+Build%22

[github-watch-badge]: https://img.shields.io/github/watchers/everoddandeven/monerod-gui.svg?style=social
[github-watch]: https://github.com/everoddandeven/monerod-gui/watchers
[github-star-badge]: https://img.shields.io/github/stars/everoddandeven/monerod-gui.svg?style=social
[github-star]: https://github.com/everoddandeven/monerod-gui/stargazers

[bitcoin-donated]: https://github.com/everoddandeven/monerod-gui?tab=readme-ov-file#bitcoin
[bitcoin-donated-badge]: https://img.shields.io/badge/dynamic/json?url=https://explorer.viawallet.com/res/btc/addresses/bc1qndc2lesy0sse9vj33a35pnfrqz4znlhhs58vfp&query=$.data.balance&suffix=%20BTC&logo=bitcoin&label=donated

## Donating

Please consider donating to support the development of this project.
Expand All @@ -220,3 +236,21 @@ Please consider donating to support the development of this project.
<img src="donate_wow.png" width="115" height="115" alt="wowQrCode"/><br>
<code>WW33Zj3xu6EGTyKVWaz8EQZmqsTXKdK5eG7PDRaiPuJ1LyREhGHLCRDX3AaLx4r9NFCThRvsbq99KATbswJaxd3T1iwQLJ3Tw</code>
</p>

[maintained-badge]: https://img.shields.io/badge/maintained-yes-brightgreen
[license-badge]: https://img.shields.io/badge/license-MIT-blue.svg
[prs-badge]: https://img.shields.io/badge/PRs-welcome-red.svg
[prs]: http://makeapullrequest.com

[macos-build-badge]: https://github.com/everoddandeven/monerod-gui/workflows/MacOS%20Build/badge.svg
[macos-build]: https://github.com/everoddandeven/monerod-gui/actions?query=workflow%3A%22MacOS+Build%22
[windows-build-badge]: https://github.com/everoddandeven/monerod-gui/workflows/Windows%20Build/badge.svg
[windows-build]: https://github.com/everoddandeven/monerod-gui/actions?query=workflow%3A%22Windows+Build%22

[github-watch-badge]: https://img.shields.io/github/watchers/everoddandeven/monerod-gui.svg?style=social
[github-watch]: https://github.com/everoddandeven/monerod-gui/watchers
[github-star-badge]: https://img.shields.io/github/stars/everoddandeven/monerod-gui.svg?style=social
[github-star]: https://github.com/everoddandeven/monerod-gui/stargazers

[bitcoin-donated]: https://github.com/everoddandeven/monerod-gui?tab=readme-ov-file#bitcoin
[bitcoin-donated-badge]: https://img.shields.io/badge/dynamic/json?url=https://explorer.viawallet.com/res/btc/addresses/bc1qndc2lesy0sse9vj33a35pnfrqz4znlhhs58vfp&query=$.data.balance&suffix=%20BTC&logo=bitcoin&label=donated
3 changes: 2 additions & 1 deletion angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
"src/assets",
"src/splash.html"
],
"scripts": [
"node_modules/jquery/dist/jquery.min.js",
Expand Down
Loading
Loading