Skip to content

Commit

Permalink
couple of fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mesh0000
mesh0000 committed Mar 8, 2017
1 parent fe074a1 commit 6fa7839
Show file tree
Hide file tree
Showing 9 changed files with 138 additions and 80 deletions.
30 changes: 27 additions & 3 deletions app/admin/config.html
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,46 @@
<md-content flex>
<md-toolbar class="md-table-toolbar md-default" ng-show="!selected.length">
<div class="md-toolbar-tools">
<span>Pool Config</span>
<span flex></span>
<!-- <md-button class="md-icon-button" ng-click="loadStuff()">
<md-icon>add</md-icon>
</md-button> -->

</div>
</md-toolbar>

<md-toolbar class="md-table-toolbar alternate" ng-show="selected.length">
<div class="md-toolbar-tools">
<span>{{selected.length}} {{selected.length > 1 ? 'items' : 'item'}} selected</span>
<span flex></span>

</div>
</md-toolbar>
<md-table-container>
<table md-table md-row-select ng-model="selected" md-progress="promise">
<table md-table data-ng-model="selected" md-progress="promise" md-row-select>
<thead md-head>
<tr md-row>
<th></th>
<th md-column><h2 class="md-subhead">ID</h2></th>
<th md-column><h2 class="md-subhead">Module</h2></th>
<th md-column><h2 class="md-subhead">Item</h2></th>
<th md-column><h2 class="md-subhead">Value</h2></th>
<th md-column><h2 class="md-subhead">Type</h2></th>
<th md-column><h2 class="md-subhead">Module</h2></th>
</tr>
</thead>
<tbody md-body>
<tr md-row ng-repeat="config in pool_configs">
<td md-cell>
<md-button class="md-icon-button" ng-click="editConfig($event, config)">
<md-icon>mode_edit</md-icon>
</md-button>
</td>
<td md-cell>{{config.id}}</td>
<td md-cell>{{config.module}}</td>
<td md-cell>{{config.item}}</td>
<td md-cell>{{config.value}}</td>
<td md-cell>{{config.type}}</td>
<td md-cell>{{config.module}}</td>
</tr>
</tbody>
</table>
Expand Down
13 changes: 13 additions & 0 deletions app/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ html, body {
font-size:14px;
margin: 0px;
padding: 0px;
min-width: 420px;
}

a {
Expand Down Expand Up @@ -42,6 +43,18 @@ a:active {
background: #00796B;
}

md-tooltip .md-content {
height: auto !important;
}

.navbar .smallfont h3{
font-size: 0.7em;
}

.navbar .smallfont h3 b{
display: inline-block;
}

.sidenav {
background-color: #2b333e;
}
Expand Down
1 change: 0 additions & 1 deletion app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ app.controller('AppCtrl', function($scope, $window, $route, $interval, $mdDialog
// ------- App Update
var update = function() {
if (appCache.status == window.applicationCache.UPDATEREADY) {
appCache.swapCache(); // The fetch was successful, swap in the new cache.
$window.location.reload();
}
}
Expand Down
5 changes: 1 addition & 4 deletions app/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,13 @@ <h1 class="md-toolbar-tools">XMRPool.net <i class="md-caption">beta</i></h1>

<md-content flex id="main">
<md-toolbar class="navbar md-whiteframe-2dp">
<div class="md-toolbar-tools maintoolbar" layout="row">
<div class="md-toolbar-tools maintoolbar text-center" ng-class="{smallfont: !menuOpen}" layout="row">
<md-button class="md-icon-button" type="button" ng-click="toggleSidenav()">
<md-icon md-font-set="material-icons">menu</md-icon>
</md-button>
<!-- <div layout="row" flex> -->
<h3 flex><a href="#/dashboard">Network : <b>{{network.difficulty | difficultyToHashRate | toHashRate}}</b></a></h3>
<h3 flex><a href="#/dashboard">Pool : <b>{{poolStats.global.hashRate | toHashRate}}</b></a></h3>
<h3 flex><a href="#/dashboard">You : <b>{{yourTotalHashRate | toHashRate}}</b></a></h3>
<!-- </div> -->
<div flex></div>
<div>
<md-button class="md-raised md-accent" aria-label="Miner Login" ng-click="minerLogin($event)" ng-if="!isLoggedIn()">
<md-icon class="login">fingerprint</md-icon>
Expand Down
2 changes: 1 addition & 1 deletion app/user/dashboard/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ <h5> Total Paid<h2>{{miner.amtPaid | toXMR | number:10}} XMR</h2></h5>
</tr>
</thead>
<tbody md-body>
<tr md-row ng-repeat="(index, id) in addrStats[addr].ids" md-select="id" data-md-on-select="updateCharts" md-on-deselect="updateCharts" x-md-auto-select="minerStats[addr].toptions.autoSelect">
<tr md-row ng-repeat="(index, id) in addrStats[addr].ids" md-select="id" data-md-on-select="updateCharts" md-on-deselect="updateCharts">
<td md-cell><p class="md-body-2">{{id}}</p></td>
<td md-cell><p class="md-body-2">{{minerStats[addr].dataset[id][0].hs | toHashRate}}</p></td>
<td md-cell><p class="md-body-2">{{addrStats[addr].workerStats[id].totalHash | number}}</p></td>
Expand Down
29 changes: 27 additions & 2 deletions app/user/help/getting_started.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,38 @@
</div>
</md-toolbar>
<md-card-content>
<p class="panel-subtitle">Welcome to xmrpool, a an actively developed Monero pool.</p>
<p class="panel-subtitle">If you are new to mining, this is the place for you.</p>
<p class="panel-subtitle">Confusing at first but its as easy as 1, 2, 3</p>
</md-card-content>
</md-card>
<md-card>
<md-toolbar class="md-table-toolbar md-default">
<div class="md-toolbar-tools">
<span>2. Pick a mining server and port</span>
<span>1. Create a Wallet</span>
</div>
</md-toolbar>
<md-card-content>
<p class="panel-subtitle">Both online wallets and hardware wallets have their pros and cons</p>
<p class="panel-subtitle">Software Wallet / MyMonero</p>
</md-card-content>
</md-card>
<md-card>
<md-toolbar class="md-table-toolbar md-default">
<div class="md-toolbar-tools">
<span>2. Download mining software</span>
</div>
</md-toolbar>
<md-card-content>
<p class="panel-subtitle">Curious what the port types are? Most miners are best served by PPLNS, which
helps to combat pool hopping and ensures a good payout for miners. PPS is the most stable option of
the lot, ensuring that you get paid out for every share, but with a higher fee for the risk the pool
takes. Solo ports are for those who like to gamble and want to try and find their own block!</p>
</md-card-content>
</md-card>
<md-card>
<md-toolbar class="md-table-toolbar md-default">
<div class="md-toolbar-tools">
<span>3. Pick a server and port</span>
</div>
</md-toolbar>
<md-card-content>
Expand Down
131 changes: 66 additions & 65 deletions app/user/home/home.html
View file
Original file line number Diff line number Diff line change
@@ -1,69 +1,78 @@
<ng-include src="'user/dashboard/poolstats.html'"></ng-include>
<div layout-sm="column" layout="row" flex>
<div layout="column" flex>
<md-card>
<div layout="column" layout-gt-md="row" flex>
<md-card flex>
<md-card-title>
<md-card-title-text>
<span class="md-headline">Welcome to XMRpool.net!</span>
<span class="md-subhead">A high performance pool that has nodes in several key locations around the globe and exremely low fees.</span>
<span class="md-subhead">So, you'll find the best ping and uptime no matter where your based, help strengthen the XMR network and make some XMR on the way!</span>
</md-card-title-text>
</md-card-title>
<md-card-content>
<h3>Start mining now <span class="md-subhead">(see <a href="#/help/getting_started">getting started</a>)</span></h3>
<p>Please stay tuned for more features and changes! If you have a feature request, please poke Snipa on irc.freenode.net in <a href="#/help/chat">#monero-pools</a></p>
<h4>Pool Features!</h4>
<ul>
<li>PaymentID payments for Exchanges</li>
<li>PPLNS and Solo mining systems</li>
<li>Patched for the 127 transaction bug</li>
<li>Geographically diverse server locations with GeoDNS</li>
<li>Well-documented <a href="https://cryptonote-pool-api.restlet.io/">API</a> with active development efforts</li>
<li>Payments direct to BTC via Shapeshift.io and XMR.to depending on who's got the best rates</li>
<li>Supports the Monero network by offering high speed block transit from London to Singapore via the USA</li>
<li>Set your own payment thresholds for normal wallets + exchanges!</li>
<li>Per-Worker hashrate charts</li>
<li>Payments every 2 hours</li>
<li>E-mail/SMS notification of miners down</li>
</ul>
<h4>New Features!</h4>
<ul>
<li>12/31/2017 - New Username/Password Formats (Check the FAQ for details!)</li>
<li>12/29/2017 - Integrated Address Support (Tux Exchange users rejoice!)</li>
</ul>
<h4>Upcoming Features</h4>
<ul>
<li>Websocket based stats for rapid updates</li>
<li>New stratum protocol for XMR as developed by Wolf0</li>
</ul>
</md-card-content>
</md-card>
<div flex flex-gt-md="30">
<md-card flex>
<md-card-title>
<md-card-title-text>
<span class="md-headline">Welcome to XMRpool.net!</span>
<span class="md-subhead">A modern, hard-fork compatible monero mining pool, featuring PPS, PPLNS, and solo ports.</span>
</md-card-title-text>
<span class="md-headline">Pool Config</span>
</md-card-title>
<md-card-title-media>
<div class="md-media-lg card-media"></div>
</md-card-title-media>
<md-card-content>
<h3>Note!</h3>
<p>This project is still in development. Please stay tuned for more features and changes! If you have a feature request, please poke Snipa on irc.freenode.net in #monero-pools</p>
<h4>Pool Features!</h4>
<ul>
<li>PaymentID payments for Exchanges</li>
<li>PPLNS, PPS, Solo mining systems</li>
<li>Patched for the 127 transaction bug</li>
<li>Geographically diverse server locations with GeoDNS</li>
<li>Well-documented <a href="https://cryptonote-pool-api.restlet.io/">API</a> with active development efforts</li>
<li>Payments direct to BTC via Shapeshift.io and XMR.to depending on who's got the best rates</li>
<li>Supports the Monero network by offering high speed block transit from London to Singapore via the USA</li>
<li>Payments every 2 hours</li>
</ul>
<h4>New Features!</h4>
<ul>
<li>12/31/2017 - New Username/Password Formats (Check the FAQ for details!)</li>
<li>12/29/2017 - Integrated Address Support (Tux Exchange users rejoice!)</li>
</ul>
<h4>Upcoming Features</h4>
<ul>
<li>E-mail/SMS notification of miners down</li>
<li>Per-Worker hashrate charts</li>
<li>Websocket based stats for rapid updates</li>
<li>New stratum protocol for XMR as developed by Wolf0</li>
<li>Set your own payment thresholds for normal wallets + exchanges!</li>
</ul>
</md-card-content>
</md-card>
</div>
<div layout="column" flex-gt-md="30" >
<md-card>
<md-card-title>
<md-card-title-text>
<span class="md-headline">Pool Config</span>
</md-card-title-text>
</md-card-title>
<md-card-title-media>
<div class="md-media-lg card-media"></div>
</md-card-title-media>
<md-card-content>
<md-list>
<md-list-item>
<p>PPS Fee</p>
<p class="text-right">{{config.pps_fee}}%</p>
<span class="text-right">
{{config.pps_fee}}%
<md-tooltip>
Core Devs Donation: {{config.dev_donation/100*config.pps_fee | number:3 }}% |
Pool Devs Donation:{{config.pool_dev_donation/100*config.pps_fee | number:3 }}%
</md-tooltip>
</span>
</md-list-item>
<md-list-item>
<p>PPLNS Fee</p>
<p class="text-right">{{config.pplns_fee}}%</p>
<span class="text-right">
{{config.pplns_fee}}%
<md-tooltip>
Core Devs Donation: {{config.dev_donation/100*config.pplns_fee | number:3 }}% |
Pool Devs Donation:{{config.pool_dev_donation/100*config.pplns_fee | number:3 }}%
</md-tooltip>
</span>
</md-list-item>
<md-list-item>
<p>Solo Fee</p>
<p class="text-right">{{config.solo_fee}}%</p>
<p class="text-right">
{{config.solo_fee}}%
<md-tooltip>
Core Devs Donation: {{config.dev_donation/100*config.solo_fee | number:3}}% |
Pool Devs Donation:{{config.pool_dev_donation/100*config.solo_fee | number:3}}%
</md-tooltip>
</p>
</md-list-item>
<md-list-item>
<p>BTC Fee</p>
Expand All @@ -81,14 +90,6 @@ <h4>Upcoming Features</h4>
<p>Minimum payout (Exchange)</p>
<p class="text-right">{{config.min_exchange_payout | toXMR}} XMR</p>
</md-list-item>
<md-list-item>
<p>Core Devs Donation</p>
<p class="text-right">{{config.dev_donation}}%</p>
</md-list-item>
<md-list-item>
<p>Pool Devs Donation</p>
<p class="text-right">{{config.pool_dev_donation}}%</p>
</md-list-item>
<md-list-item>
<p>Block Maturity Depth</p>
<p class="text-right">{{config.maturity_depth}}</p>
Expand All @@ -97,7 +98,7 @@ <h4>Upcoming Features</h4>
<p>Minimum Denomination</p>
<p class="text-right">{{config.min_denom | toXMR}}</p>
</md-list-item>
</md-card-content>
</md-card>
</div>
</div>
</md-list>
</md-card-content>
</md-card></div>
</div>
3 changes: 1 addition & 2 deletions app/utils/services.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ angular.module('utils.services', [])
selected: [],
toptions: {
rowSelection: true,
multiSelect: true,
autoSelect: true
multiSelect: true
}
};

Expand Down
4 changes: 2 additions & 2 deletions readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

### Run it

Set pool params in app/config.js
Set pool params in app/globals.js

Requires NodeJS

Expand All @@ -33,7 +33,7 @@ $ npm install # runs everything, serve from ./build
* Ship it deployment
* Websockets
* Miner graph colour picker
* Active sidebar item


### Support
* I'm usually on #monero-pools so drop me a line if you need help with something or have a feature request.
Expand Down

0 comments on commit 6fa7839

Please sign in to comment.