oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

readme typo fix, donation bitcoin address added, force linux mergemedia path slashes, loading screen anim fix

Browse source
This commit is contained in:
HelloZeroNet 2015-01-13 00:29:40 +01:00
parent ceb8ce6027
commit 4b02417b61
5 changed files with 913 additions and 903 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
README.md
View file

@ -1,6 +1,6 @@
# ZeroNet # ZeroNet
Decentralized web platform using Bitcoin crypto and BitTorrent network Decentralized websites using Bitcoin crypto and BitTorrent network
## Why? ## Why?
@ -13,7 +13,7 @@ Decentralized web platform using Bitcoin crypto and BitTorrent network
## How does it works? ## How does it works?
- After starting `zeronet.py` you will be able to visit zeronet sites using http://127.0.0.1:43110/{zeronet_address} (eg. http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr). - After starting `zeronet.py` you will be able to visit zeronet sites using http://127.0.0.1:43110/{zeronet_address} (eg. http://127.0.0.1:43110/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr).
- When you visit a new zeronet site, it's try to find peers using BitTorrent network and download the site files (html, css, js...) from them. - When you visit a new zeronet site, it's trying to find peers using BitTorrent network and download the site files (html, css, js...) from them.
- Each visited sites become also served by You. - Each visited sites become also served by You.
- Every site containing a `site.json` which holds all other files sha1 hash and a sign generated using site's private key. - Every site containing a `site.json` which holds all other files sha1 hash and a sign generated using site's private key.
- If the site owner (who has the private key for the site address) modifies the site, then he/she signs the new `content.json` and publish it to the peers. After the peers verified the `content.json` integrity using the sign they download the modified files and publish the new content to other peers. - If the site owner (who has the private key for the site address) modifies the site, then he/she signs the new `content.json` and publish it to the peers. After the peers verified the `content.json` integrity using the sign they download the modified files and publish the new content to other peers.
@ -70,3 +70,10 @@ Site:13DNDk..bhC2 Successfuly published to 3 peers
- Serving files.... - Serving files....
``` ```
- That's it! You successfuly signed and published your modifications. - That's it! You successfuly signed and published your modifications.
## If you want to help keep this project alive
Bitcoin: 1QDhxQ6PraUZa21ET5fYUCPgdrwBomnFgX
#### Thank you!

2
src/Debug/DebugMedia.py
View file

@ -33,7 +33,7 @@ def merge(merged_path):
# Merge files # Merge files
parts = [] parts = []
for file_path in findfiles(merge_dir, find_ext): for file_path in findfiles(merge_dir, find_ext):
parts.append("\n\n/* ---- %s ---- */\n\n" % file_path) parts.append("\n\n/* ---- %s ---- */\n\n" % file_path.replace("\\", "/"))
if file_path.endswith(".coffee"): # Compile coffee script if file_path.endswith(".coffee"): # Compile coffee script
if not config.coffeescript_compiler: if not config.coffeescript_compiler:
logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path) logging.error("No coffeescript compiler definied, skipping compiling %s" % merged_path)

9
src/Ui/media/Loading.coffee
View file

@ -12,10 +12,11 @@ class Loading
# We dont need loadingscreen anymore # We dont need loadingscreen anymore
hideScreen: -> hideScreen: ->
if @screen_visible # Hide with animate if not $(".loadingscreen").hasClass("done") # Nothing to do, just let the animtion to be finished
$(".loadingscreen").addClass("done").removeLater(2000) if @screen_visible # Hide with animate
else # Not visible, just remove $(".loadingscreen").addClass("done").removeLater(2000)
$(".loadingscreen").remove() else # Not visible, just remove
$(".loadingscreen").remove()
@screen_visible = false @screen_visible = false

20
src/Ui/media/all.js
View file

@ -1,6 +1,6 @@
/* ---- src/Ui/media\lib/00-jquery.min.js ---- */ /* ---- src/Ui/media/lib/00-jquery.min.js ---- */
/*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ /*! jQuery v2.1.3 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */
@ -10,7 +10,7 @@
/* ---- src/Ui/media\lib/ZeroWebsocket.coffee ---- */ /* ---- src/Ui/media/lib/ZeroWebsocket.coffee ---- */
(function() { (function() {
@ -147,7 +147,7 @@
/* ---- src/Ui/media\lib/jquery.cssanim.js ---- */ /* ---- src/Ui/media/lib/jquery.cssanim.js ---- */
jQuery.cssHooks['scale'] = { jQuery.cssHooks['scale'] = {
@ -179,7 +179,7 @@ jQuery.fx.step.scale = function(fx) {
}; };
/* ---- src/Ui/media\lib/jquery.csslater.coffee ---- */ /* ---- src/Ui/media/lib/jquery.csslater.coffee ---- */
(function() { (function() {
@ -245,7 +245,7 @@ jQuery.fx.step.scale = function(fx) {
/* ---- src/Ui/media\lib/jquery.easing.1.3.js ---- */ /* ---- src/Ui/media/lib/jquery.easing.1.3.js ---- */
/* /*
@ -475,10 +475,12 @@ jQuery.extend( jQuery.easing,
}; };
Loading.prototype.hideScreen = function() { Loading.prototype.hideScreen = function() {
if (this.screen_visible) { if (!$(".loadingscreen").hasClass("done")) {
$(".loadingscreen").addClass("done").removeLater(2000); if (this.screen_visible) {
} else { $(".loadingscreen").addClass("done").removeLater(2000);
$(".loadingscreen").remove(); } else {
$(".loadingscreen").remove();
}
} }
return this.screen_visible = false; return this.screen_visible = false;
}; };

2
zeronet.py
View file

@ -6,4 +6,4 @@ try:
except Exception, err: # Prevent closing except Exception, err: # Prevent closing
import traceback import traceback
traceback.print_exc() traceback.print_exc()
raw_input("-- Error happend, press enter to close --") raw_input("-- Error happened, press enter to close --")