Skip to content

Commit

Permalink
Merge pull request #8 from vv181/dev
Browse files Browse the repository at this point in the history
Bug fix
  • Loading branch information
cnohall authored Jun 17, 2021
2 parents 7d5bcd8 + dae8857 commit 9ec7619
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
*/*/__pycache__
venv
db.sqlite3
*/.vscode/*`
*/.vscode/*
.env
*.code-workspace
**/migrations/*
satoshi_box/.env
Expand Down
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,18 @@ SatoshiBox is a tool for those who want to sell files anonymously and receive BT
### Requirements
Make sure you have [Python](https://www.python.org/downloads/) and [Pip](https://pip.pypa.io/en/latest/installing/#installing-with-get-pip-py) installed. Python version >= 3.6 is required.

You also need Django, django-hitcount and bootstrap-py. These can be installed by running:
You also need Django, and other dependencies. These can be installed by running:

```
pip install django
pip install django-hitcount
pip install bootstrap-py
pip install python-dotenv
pip install -r requirements.txt
```
After you have installed the packages mentioned above nativate to your SatoshiBox folder with your terminal and run:
```
python manage.py migrate
python manage.py makemigrations
python manage.py migrate
```
Update the `SECRET_KEY` [here](https://github.com/cnohall/SatoshiBox/blob/master/satoshi_box/settings.py#L28) and the `BLOCKONOMICS_KEY`, `EMAIL_HOST_USER`, `EMAIL_HOST_PASSWORD` [here](https://github.com/cnohall/SatoshiBox/blob/master/satoshi_box/settings.py#L130-L135), with your own values. It is recommended that you do so by specifying your own `.env` file.
Update the `SECRET_KEY` [here](https://github.com/cnohall/SatoshiBox/blob/master/satoshi_box/settings.py#L28) and the `BLOCKONOMICS_KEY`, `EMAIL_HOST_USER`, `EMAIL_HOST_PASSWORD` [here](https://github.com/cnohall/SatoshiBox/blob/master/satoshi_box/settings.py#L130-L135), with your own values. If you haven't yet set up [Blockonomics Xpub merchant](https://www.blockonomics.co/merchants#/) value, please set it up first. It is recommended that you do so by specifying your own `.env` file.
Lastly, you can start the server by running:
```
python manage.py runserver 8080
Expand Down
3 changes: 3 additions & 0 deletions core/static/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ file.addEventListener('change', function(e) {
file.setCustomValidity('Total size exceeds 5mb');
file.reportValidity();
}
else{
file.setCustomValidity('');
}
document.getElementById('value').innerHTML = "Selected " + val;
document.getElementById('size').innerHTML = "Total size: " + size + ' MB';
});

0 comments on commit 9ec7619

Please sign in to comment.