diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1269488 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +data diff --git a/content.json b/content.json index ee076fe..b571dcd 100644 --- a/content.json +++ b/content.json @@ -1,21 +1,28 @@ { - "address": "1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT", + "address": "1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW", "background-color": "#F5F5F5", "cloneable": true, - "description": "Decentralized forum with ZeroID", - "domain": "Talk.ZeroNetwork.bit", + "description": "Decentralized threadded forum with ZeroID", "files": { + "LICENSE": { + "sha512": "d281feecb7d1218e1aea8269f288fcd63385da1a130681fadae77262637cb65f", + "size": 18027 + }, + "README.md": { + "sha512": "e1b4d5bf8c4d9a95da8a12341b232faf9d163bd6398de6711f4756c07f5f802c", + "size": 99 + }, "css/all.css": { - "sha512": "f91aa9692272706e4d219939972cffa2a9a20ab66099fb8b24ee60e60c2929fa", - "size": 164580 + "sha512": "2408a40e84d49a74057eb878a006d7820c3e12dae695e3153fa9ebbe1e358347", + "size": 165617 }, "data-default/users/content-default.json": { "sha512": "c1642cc2922a74c3e74991f0194e2acc46dc5e003207a0028dad63c75c41a0ec", "size": 672 }, "dbschema.json": { - "sha512": "7996d60b522185ed085f718fb4e2afdfa4c4358a9225190d7940d41fd701bd58", - "size": 3064 + "sha512": "8ad577fdb6ad309600bec3539b942fc652934385bd8d4f27a6099955c04b1e4f", + "size": 3091 }, "img/edit.png": { "sha512": "60ba4297e205b038bf7852ead2b88f9373cd8848408bb258dbcebb086d43f056", @@ -34,47 +41,51 @@ "size": 310 }, "index.html": { - "sha512": "8e205ea0a12826afe49e80592a4e94ac6c16bfaa5f6c7112085d9c249ad38e32", - "size": 8308 + "sha512": "0f82c5fe053b8a82518308d8d1878b3ba513841dc0c105217ef53096d507ac72", + "size": 8366 }, "js/all.js": { - "sha512": "dda3fdd5694cf7d2952460416d6d3646ed37c65ac412562f4bb3815a8f55dd9e", - "size": 231470 + "sha512": "3317ae5b0fbdb95197bf0f0e2f1b5f1a9d1bc95863ec80ca3fd0d1b8ab5a3679", + "size": 226996 }, "languages/da.json": { - "sha512": "4947ef2bb4f4d9551561057ec7d6dea9e881d211ca7f9c0bec7f2dc7493fa2ec", - "size": 1219 + "sha512": "822c90a229d428db7ad2a9e421bfb80f57bae8b58cb6fd45df407b1aee0fbd5f", + "size": 1178 }, "languages/fr.json": { - "sha512": "79a84ab9d2d7589ba88f07d4d63a4aa922ba08f890bb7a0f2e0addc3c781b9b8", - "size": 1234 + "sha512": "43be0c5d823e5e3863e710ddc386ee6be596118472c47ad6150372e9d9e61391", + "size": 1193 }, "languages/hu.json": { "sha512": "844c4036c6f8874d7ea82dd68e6337051099cd4674bed1ba647a0607ac878981", "size": 1235 }, "languages/it.json": { - "sha512": "b3cad975a56f5226977a32047d0af2d8381176588040b31f4c4c4a6df1ed2fcb", - "size": 1265 + "sha512": "79df61d1baa95dc9a1095296897cebfe1db0608effd4c0f7ae398b5d5dc702ab", + "size": 1224 }, "languages/pl.json": { "sha512": "eb9d7572cf4c76ed71f1c4c15a766128203b574008ae5bfe6a12caefdbc033a6", "size": 1623 }, + "languages/sk.json": { + "sha512": "4dc909c7fcec664dbd37c5c8f7129e91259f81157ca102ce55af6fc59264f887", + "size": 1205 + }, "languages/uk.json": { - "sha512": "f4d991841471a155dcd48f492e5ec196f5a8630dd088ed3eaf0592e02da2c3b1", - "size": 1606 + "sha512": "0fb443d489b5dfc808cc565b4e0247dad1f4ed1ad72652bac82f4794ff4ec816", + "size": 1564 }, "languages/zh-tw.json": { - "sha512": "0e90a4bdcc5ef602050011b193d9038c766d2a72a0193118bd3bf0d0b80472d0", - "size": 1861 + "sha512": "e0d65cdd6c244d85af64e37d8c3cfd3afceb6fef5217d0dc65bd5dedc9d8461b", + "size": 1811 }, "languages/zh.json": { - "sha512": "2d6dd282ea98cde7c9463e085dd7a25674b4ca2e5038d7a2b471acc13aadef80", - "size": 1863 + "sha512": "6af6e63c4c15c860276024413fc4baf9fb74ca3d4f209dfc8860cdf7c8a07158", + "size": 1813 } }, - "ignore": "((js|css)/(?!all.(js|css))|data/users/.*db|data/users/.*/.*|data/archived|.*.py)", + "ignore": "((js|css)/(?!all.(js|css))|data/users/.*db|data/users/.*/.*|data/archived|.*.py|.git)", "includes": { "data/users/content.json": { "signers": [], @@ -82,30 +93,20 @@ } }, "inner_path": "content.json", - "modified": 1495534127, + "modified": 1517148490, "postmessage_nonce_security": true, "settings": { - "admin": "nofish", - "admin_href": "http://127.0.0.1:43110/Mail.ZeroNetwork.bit/?to=nofish", - "topic_sticky_uris": [ - "2_1J3rJ8ecnwH2EPYa6MrgZttBNc61ACFiCj", - "8_1J3rJ8ecnwH2EPYa6MrgZttBNc61ACFiCj" - ] + "admin": "mnemonic", + "admin_href": "http://127.0.0.1:43110/Mail.ZeroNetwork.bit/?to=mnemonic", + "topic_sticky_uris": ["2_1J3rJ8ecnwH2EPYa6MrgZttBNc61ACFiCj", "8_1J3rJ8ecnwH2EPYa6MrgZttBNc61ACFiCj"] }, - "sign": [ - 34570195314575724773194421641170479386596097819563278628113774150131154300723, - 85654364444520478186506683007915265499527324850084136121532266661650383491804 - ], - "signers_sign": "G2/6ljsXbej7laqD3JUGsa8IEgSGE+NZs2jg9reQ3vrlXLgsYX67t9yRcqOuRnKxuC+4+XPo/XdVztlERvr9viI=", + "signers_sign": "G7Ko4/yjSlcyctIapMcBv1FTJrx0G7FretQWYbHX0GuUbRyQfu6e6MzsC5IYfqVu60yrSRSka9t/yt1ZbT+kA8Q=", "signs": { - "1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT": "G3tpNQ3SKc9VrTy0U7cYYrRRZCu95pKR9yn/9i2wfkfGMeFAdUyyHldpiPU8Zm3z9cMUulIenfN+QGJJCDgQBFc=" + "1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW": "HLKoCitl+VVr1bdU/oKlAwsB23MtKeGWc9d85h3bnVqJbh54OmEE1z1KFDIRokOWH4Wn9t8SiVynMk+p1aqHlCU=" }, "signs_required": 1, - "title": "ZeroTalk", - "translate": [ - "index.html", - "js/all.js" - ], + "title": "ZeroHive", + "translate": ["index.html", "js/all.js"], "viewport": "width=device-width, initial-scale=1.0", - "zeronet_version": "0.5.5" + "zeronet_version": "0.6.1" } \ No newline at end of file diff --git a/css/ZeroTalk.css b/css/ZeroTalk.css index 320ea1a..87abb0f 100644 --- a/css/ZeroTalk.css +++ b/css/ZeroTalk.css @@ -197,6 +197,12 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro .comment .body blockquote a { color: #333 } .comment .body table { border-collapse: collapse; margin-bottom: 10px } .comment .body td, .comment .body th { padding: 5px 10px; border: 1px solid #EEE; border-collapse: collapse; text-align: left } +.level_0 { } +.level_1 { margin-left: 30px } +.level_2 { margin-left: 60px } +.level_3 { margin-left: 90px } +.level_4 { margin-left: 120px } +.level_5 { margin-left: 150px } .comment-new { margin-bottom: 5px } .comment-new .button-submit { } diff --git a/css/all.css b/css/all.css index a60fd1b..c4dfe9c 100644 --- a/css/all.css +++ b/css/all.css @@ -1,6 +1,6 @@ -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/Follow.css ---- */ +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/Follow.css ---- */ .icon-feed { @@ -38,7 +38,7 @@ .feed-follow-show:hover { border: 1px solid white } -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/InlineEditor.css ---- */ +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/InlineEditor.css ---- */ /* Editable */ @@ -85,7 +85,7 @@ } -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/Menu.css ---- */ +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/Menu.css ---- */ .menu { @@ -109,7 +109,8 @@ } -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/ZeroTalk.css ---- */ + +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/ZeroTalk.css ---- */ body { background-color: #F5F5F5; color: #333332; margin: 10px; padding: 0px; font-family: 'Roboto', sans-serif; height: 15000px; overflow: hidden; -webkit-backface-visibility: hidden; -moz-backface-visibility: hidden; -o-backface-visibility: hidden; -ms-backface-visibility: hidden; backface-visibility: hidden ; } @@ -253,7 +254,8 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro .topic .title input { color: #DB3207; font-weight: bold; font-size: 1em } .topic .owner { font-size: 12px; color: #BBB } .topic .body { line-height: 1.5em; display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap } -.topic .body p { margin: 0px } +.topic .body > :first-child { margin-top: 0px } +.topic .body > :last-child { margin-bottom: 0px } .topic .link { font-size: 13px; color: #AAA; margin-bottom: 7px; overflow: hidden; display: block; white-space: nowrap; text-overflow: ellipsis } .topic .info { font-size: 12px; color: #AAA; margin-bottom: 7px; margin-top: 10px } .topic .info span { font-weight: bold } @@ -310,6 +312,12 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro .comment .body blockquote a { color: #333 } .comment .body table { border-collapse: collapse; margin-bottom: 10px } .comment .body td, .comment .body th { padding: 5px 10px; border: 1px solid #EEE; border-collapse: collapse; text-align: left } +.level_0 { } +.level_1 { margin-left: 30px } +.level_2 { margin-left: 60px } +.level_3 { margin-left: 90px } +.level_4 { margin-left: 120px } +.level_5 { margin-left: 150px } .comment-new { margin-bottom: 5px } .comment-new .button-submit { } @@ -373,6 +381,7 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro .topics-title { font-size: 24px; display: block; margin-bottom: 3px; margin-top: -2px; } .feed-follow-list { margin-left: 8px; } .topic-new-link { margin-top: 0px; } + .started { display: block; position: absolute; right: 10px; bottom: 5px; } } @media screen and (max-width: 600px) { @@ -384,7 +393,8 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro } -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/fonts.css ---- */ + +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/fonts.css ---- */ /* Base64 encoder: http://www.motobit.com/util/base64-decoder-encoder.asp */ @@ -429,7 +439,7 @@ input.text:focus, textarea:focus { border-color: #5FC0EA; outline: none; backgro -/* ---- /1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT/css/icons.css ---- */ +/* ---- /1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW/css/icons.css ---- */ .icon { display: inline-block; vertical-align: text-bottom; background-repeat: no-repeat; } diff --git a/data/users/content.json b/data/users/content.json index 3eee6cb..a0c35a5 100644 --- a/data/users/content.json +++ b/data/users/content.json @@ -1,25 +1,27 @@ { + "address": "1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW", "files": {}, "ignore": ".*", - "modified": 1436226671.535, + "inner_path": "data/users/content.json", + "modified": 1517091436, "signs": { - "1TaLkFrMwvbNsooF4ioKAY9EuxTBTjipT": "HMS7KltLokl44coJqRBPmGTGVpY48H2nbayXOsCo21J9DtwIUCf47O6WNJdW6WUgObV/NzHr0yiCWey6uDmxlLo=" + "1Hive8oUEeJeheQBLui2zgAxRq7hDasyEW": "Gz1r5D60QfbPtaf5to2l+PptR+K3NzTKDuM2ziCzka3pf1yCrfAw8EryzFivJg0DRC5Pq1tCj5jNPujpmjgIqA4=" }, "user_contents": { "cert_signers": { - "zeroid.bit": [ "1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz" ] + "zeroid.bit": ["1iD5ZQJMNXu43w1qLB8sfdHVKppVMduGz"] }, "permission_rules": { ".*": { "files_allowed": "data.json", - "max_size": 20000 + "max_size": 20000 }, - "bitid/.*@zeroid.bit": { "max_size": 40000 }, - "bitmsg/.*@zeroid.bit": { "max_size": 15000 } + "bitid/.*@zeroid.bit": {"max_size": 40000}, + "bitmsg/.*@zeroid.bit": {"max_size": 15000} }, "permissions": { "bad@zeroid.bit": false, - "nofish@zeroid.bit": { "max_size": 100000 } + "nofish@zeroid.bit": {"max_size": 100000} } } } \ No newline at end of file diff --git a/dbschema.json b/dbschema.json index 50a9454..b3ab8ea 100644 --- a/dbschema.json +++ b/dbschema.json @@ -32,7 +32,8 @@ }, "comment": { "cols": [ - ["comment_id", "INTEGER"], + ["comment_id", "TEXT"], + ["reply_to", "INTEGER"], ["body", "TEXT"], ["topic_uri", "TEXT"], ["added", "DATETIME"], @@ -64,4 +65,4 @@ "Topics": "SELECT title AS title, body AS body, added AS date_added, 'topic' AS type, '?Topic:' || topic.topic_id || '_' || topic_creator_json.directory AS url FROM topic LEFT JOIN json AS topic_creator_json ON (topic_creator_json.json_id = topic.json_id)", "Comments": "SELECT 'comment' AS type, comment.added AS date_added, topic.title AS title, commenter_user.value || ': ' || comment.body AS body, topic_creator_json.directory AS topic_creator_address, topic.topic_id || '_' || topic_creator_json.directory AS row_topic_uri, '?Topic:' || topic.topic_id || '_' || topic_creator_json.directory AS url FROM topic LEFT JOIN json AS topic_creator_json ON (topic_creator_json.json_id = topic.json_id) LEFT JOIN comment ON (comment.topic_uri = row_topic_uri) LEFT JOIN json AS commenter_json ON (commenter_json.json_id = comment.json_id) LEFT JOIN json AS commenter_content ON (commenter_content.directory = commenter_json.directory AND commenter_content.file_name = 'content.json') LEFT JOIN keyvalue AS commenter_user ON (commenter_user.json_id = commenter_content.json_id AND commenter_user.key = 'cert_user_id')" } -} \ No newline at end of file +} diff --git a/index.html b/index.html index 3d5cdce..5517e66 100644 --- a/index.html +++ b/index.html @@ -60,7 +60,7 @@
@@ -142,6 +142,7 @@