work on mail, storagecounter bugfix

This commit is contained in:
Kevin Froman 2019-02-03 12:19:50 -06:00
parent 6687b2a843
commit 0a8b31ff6e
8 changed files with 56 additions and 12 deletions

View File

@ -60,6 +60,7 @@ Everyone is welcome to help out. Help is wanted for the following:
* Testing * Testing
* Running stable nodes * Running stable nodes
* Security review/audit * Security review/audit
* Automatic I2P setup
Bitcoin: [1onion55FXzm6h8KQw3zFw2igpHcV7LPq](bitcoin:1onion55FXzm6h8KQw3zFw2igpHcV7LPq) Bitcoin: [1onion55FXzm6h8KQw3zFw2igpHcV7LPq](bitcoin:1onion55FXzm6h8KQw3zFw2igpHcV7LPq)
USD: [Ko-Fi](https://www.ko-fi.com/beardogkf) USD: [Ko-Fi](https://www.ko-fi.com/beardogkf)

View File

@ -19,8 +19,6 @@
''' '''
from gevent.pywsgi import WSGIServer, WSGIHandler from gevent.pywsgi import WSGIServer, WSGIHandler
from gevent import Timeout from gevent import Timeout
#import gevent.monkey
#gevent.monkey.patch_socket()
import flask, cgi import flask, cgi
from flask import request, Response, abort, send_from_directory from flask import request, Response, abort, send_from_directory
import sys, random, threading, hmac, hashlib, base64, time, math, os, json, socket import sys, random, threading, hmac, hashlib, base64, time, math, os, json, socket

View File

@ -124,6 +124,7 @@ class Onionr:
config.set('client.client.port', randomPort, savefile=True) config.set('client.client.port', randomPort, savefile=True)
if type(config.get('client.public.port')) is type(None): if type(config.get('client.public.port')) is type(None):
randomPort = netcontroller.getOpenPort() randomPort = netcontroller.getOpenPort()
print(randomPort)
config.set('client.public.port', randomPort, savefile=True) config.set('client.public.port', randomPort, savefile=True)
if type(config.get('client.participate')) is type(None): if type(config.get('client.participate')) is type(None):
config.set('client.participate', True, savefile=True) config.set('client.participate', True, savefile=True)
@ -774,7 +775,7 @@ class Onionr:
Onionr.setupConfig('data/', self = self) Onionr.setupConfig('data/', self = self)
if self._developmentMode: if self._developmentMode:
logger.warn('DEVELOPMENT MODE ENABLED (LESS SECURE)', timestamp = False) logger.warn('DEVELOPMENT MODE ENABLED (NOT RECOMMENDED)', timestamp = False)
net = NetController(config.get('client.public.port', 59497), apiServerIP=apiHost) net = NetController(config.get('client.public.port', 59497), apiServerIP=apiHost)
logger.debug('Tor is starting...') logger.debug('Tor is starting...')
if not net.startTor(): if not net.startTor():

View File

@ -1 +1 @@
dd3llxdp5q6ak3zmmicoy3jnodmroouv2xr7whkygiwp3rl7nf23gdad.onion i7dgbnouzyl7gv75b3eaqfz7x236abkn6nkjdpun273sydkbwcoidrid.onion

View File

@ -16,7 +16,13 @@
<span class='logoText'>Onionr Mail</span> <span class='logoText'>Onionr Mail</span>
<div class='content'> <div class='content'>
<button class='refresh'>Refresh</button> <button class='refresh'>Refresh</button>
<div id='threads' class='threads'></div> <br><br>
<div class="btn-group">
<button>Inbox</button><button>Sentbox</button><button>Drafts</button>
</div>
<div id='threads' class='threads'>
<div id='threadPlaceholder'>Nothing here yet 😞</div>
</div>
</div> </div>
<script src='/shared/misc.js'></script> <script src='/shared/misc.js'></script>
<script src='/mail/mail.js'></script> <script src='/mail/mail.js'></script>

View File

@ -2,6 +2,32 @@
padding-top: 1em; padding-top: 1em;
} }
.threads div span{ .threads div span{
padding-left: 0.5em; padding-left: 0.1em;
padding-right: 0.5em; padding-right: 0.1em;
}
#threadPlaceholder{
display: none;
margin-top: 1em;
font-size: 2em;
}
input{
background-color: white;
color: black;
}
.btn-group button {
border: 1px solid black;
padding: 10px 24px; /* Some padding */
cursor: pointer; /* Pointer/hand icon */
float: left; /* Float the buttons side by side */
}
.btn-group button:hover {
background-color: darkgray;
}
.btn-group {
margin-bottom: 2em;
} }

View File

@ -1,7 +1,16 @@
pms = '' pms = ''
threadPart = document.getElementById('threads') threadPart = document.getElementById('threads')
threadPlaceholder = document.getElementById('threadPlaceholder')
function getInbox(){ function getInbox(){
var showed = false
for(var i = 0; i < pms.length; i++) { for(var i = 0; i < pms.length; i++) {
if (pms[i].trim().length == 0){
continue
}
else{
threadPlaceholder.style.display = 'none'
showed = true
}
fetch('/getblockdata/' + pms[i], { fetch('/getblockdata/' + pms[i], {
headers: { headers: {
"token": webpass "token": webpass
@ -11,7 +20,7 @@ function getInbox(){
var entry = document.createElement('div') var entry = document.createElement('div')
var bHashDisplay = document.createElement('a') var bHashDisplay = document.createElement('span')
var senderInput = document.createElement('input') var senderInput = document.createElement('input')
var subjectLine = document.createElement('span') var subjectLine = document.createElement('span')
var dateStr = document.createElement('span') var dateStr = document.createElement('span')
@ -30,13 +39,16 @@ function getInbox(){
} }
//entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time'] //entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time']
threadPart.appendChild(entry) threadPart.appendChild(entry)
entry.appendChild(bHashDisplay) //entry.appendChild(bHashDisplay)
entry.appendChild(senderInput) entry.appendChild(senderInput)
entry.appendChild(subjectLine) entry.appendChild(subjectLine)
entry.appendChild(dateStr) entry.appendChild(dateStr)
}.bind([pms, i])) }.bind([pms, i]))
} }
if (! showed){
threadPlaceholder.style.display = 'block'
}
} }

View File

@ -18,7 +18,7 @@
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import config import config
config.reload()
class StorageCounter: class StorageCounter:
def __init__(self, coreInst): def __init__(self, coreInst):
self._core = coreInst self._core = coreInst
@ -27,7 +27,7 @@ class StorageCounter:
def isFull(self): def isFull(self):
retData = False retData = False
if self._core.config.get('allocations.disk') <= (self.getAmount() + 1000): if self._core.config.get('allocations.disk', 2000000000) <= (self.getAmount() + 1000):
retData = True retData = True
return retData return retData