From 41be1073757157a27a0330c19a0ebb609ba20f75 Mon Sep 17 00:00:00 2001 From: despiegk Date: Fri, 26 Jan 2024 07:04:37 +0300 Subject: [PATCH] ... --- README.md | 4 +- books/duniayetu_dar/SUMMARY.md | 48 +++++++++++++----- .../problems.md => community/.collection} | 0 collections/community/community.md | 2 + .../community_principles.md | 0 .../img/principles_01.png | Bin .../img/principles_02.png | Bin .../img/principles_03_.jpg | Bin .../img/principles_04.png | Bin .../img/principles_05_.jpg | Bin .../img/principles_06.png | Bin .../img/principles_07.png | Bin .../img/principles_08_.jpg | Bin .../img/principles_09.png | Bin .../img/principles_10.png | Bin .../freeflow_movement/freeflow_movement.md | 0 .../img/freeflow_movement_.jpg | Bin collections/farming/.collection | 0 .../{solutions => }/farming/farming.md | 0 .../{solutions => }/farming/img/bl_7840.png | Bin .../{solutions => }/farming/img/bl_7840b.png | Bin .../{solutions => }/farming/img/bl_7840c.png | Bin .../{solutions => }/farming/img/bl_silver.png | Bin collections/ffself_specs/others/others.md | 0 collections/ffself_specs/tech.md | 0 collections/problems/resolve_a_problem.md | 2 + .../social_warming/img/africa_young.png | Bin .../social_warming/img/social_warming.png | Bin .../social_warming/img/toabondance.png | Bin .../social_warming/img/world_behind.png | Bin .../social_warming/social_warming.md | 0 script3/actions.md | 2 +- script3/asimov.md | 15 ------ script3/book_collections.md | 15 ++++++ sync_production.sh | 4 +- 35 files changed, 60 insertions(+), 32 deletions(-) rename collections/{problems/problems.md => community/.collection} (100%) create mode 100644 collections/community/community.md rename collections/{why => community}/community_principles/community_principles.md (100%) rename collections/{why => community}/community_principles/img/principles_01.png (100%) rename collections/{why => community}/community_principles/img/principles_02.png (100%) rename collections/{why => community}/community_principles/img/principles_03_.jpg (100%) rename collections/{why => community}/community_principles/img/principles_04.png (100%) rename collections/{why => community}/community_principles/img/principles_05_.jpg (100%) rename collections/{why => community}/community_principles/img/principles_06.png (100%) rename collections/{why => community}/community_principles/img/principles_07.png (100%) rename collections/{why => community}/community_principles/img/principles_08_.jpg (100%) rename collections/{why => community}/community_principles/img/principles_09.png (100%) rename collections/{why => community}/community_principles/img/principles_10.png (100%) rename collections/{why => community}/freeflow_movement/freeflow_movement.md (100%) rename collections/{why => community}/freeflow_movement/img/freeflow_movement_.jpg (100%) create mode 100644 collections/farming/.collection rename collections/{solutions => }/farming/farming.md (100%) rename collections/{solutions => }/farming/img/bl_7840.png (100%) rename collections/{solutions => }/farming/img/bl_7840b.png (100%) rename collections/{solutions => }/farming/img/bl_7840c.png (100%) rename collections/{solutions => }/farming/img/bl_silver.png (100%) create mode 100644 collections/ffself_specs/others/others.md create mode 100644 collections/ffself_specs/tech.md create mode 100644 collections/problems/resolve_a_problem.md rename collections/{problems => why}/social_warming/img/africa_young.png (100%) rename collections/{problems => why}/social_warming/img/social_warming.png (100%) rename collections/{problems => why}/social_warming/img/toabondance.png (100%) rename collections/{problems => why}/social_warming/img/world_behind.png (100%) rename collections/{problems => why}/social_warming/social_warming.md (100%) delete mode 100644 script3/asimov.md create mode 100644 script3/book_collections.md diff --git a/README.md b/README.md index 8b4d8c9..4354082 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,10 @@ Asimov is our code name for this work untill we get better name and feedback of where to go, this is not a project of long duration we need concrete results very fast. -> [https://info.ourworld.tf/asimov](https://info.ourworld.tf/asimov) +> [https://info.ourworld.tf/duniayetu](https://info.ourworld.tf/duniayetu) ## to run the book ```bash -hero run -u https://git.ourworld.tf/asimov/info_asimov/src/branch/main/script3 -r +hero run -u https://git.ourworld.tf/threefold_coop/info_threefold_coop/src/branch/main/script3 -r ``` \ No newline at end of file diff --git a/books/duniayetu_dar/SUMMARY.md b/books/duniayetu_dar/SUMMARY.md index d08b183..d82c872 100644 --- a/books/duniayetu_dar/SUMMARY.md +++ b/books/duniayetu_dar/SUMMARY.md @@ -1,12 +1,36 @@ -- [Dunia Yetu](dunia_yetu/dunia_yetu.md) - - [About Us](dunia_yetu/about_us.md) - - [Our Core Values](dunia_yetu/our_core_values.md) -- [What We Offer](what_we_offer/what_we_offer.md) - - [A New Internet](what_we_offer/new_internet.md) - - [Coding Academy](what_we_offer/coding_academy.md) - - [Innovation Hubs](what_we_offer/innovation_hubs.md) -- [How you can Participate](how_you_can_participate/participate.md) - - [Host a Node](how_you_can_participate/host_a_node.md) - - [Build on top of Tanzania's decentralised Internet](how_you_can_participate/build.md) - - [Join Our Coding Academy](how_you_can_participate/coding_participate.md) - - [Join Our Community](how_you_can_participate/community_participate.md) \ No newline at end of file +- [Dunia Yetu](dy_intro/dunia_yetu/dunia_yetu.md) + - [About Us](dy_intro/dunia_yetu/about_us.md) + - [Our Core Values](dy_intro/dunia_yetu/our_core_values.md) +- [What We Offer](dy_intro/what_we_offer/what_we_offer.md) + - [A New Internet](dy_intro/what_we_offer/new_internet.md) + - [Coding Academy](dy_intro/what_we_offer/coding_academy.md) + - [Innovation Hubs](dy_intro/what_we_offer/innovation_hubs.md) +- [How you can Participate](dy_intro/how_you_can_participate/participate.md) + - [Host a Node](dy_intro/how_you_can_participate/host_a_node.md) + - [Build on top of Tanzania's decentralised Internet](dy_intro/how_you_can_participate/build.md) + - [Join Our Coding Academy](dy_intro/how_you_can_participate/coding_participate.md) + - [Join Our Community](dy_intro/how_you_can_participate/community_participate.md) +- [Principles](priciples/planet_people_first.md) + - [Proof of Authenticity](priciples/poa.md) +- [Why](why/why.md) + - [social warming](why/social_warming/social_warming.md) + - [Internet as Human Right](why/internet_human_right/internet_human_right.md) +- [Community](community/community.md) + - [FreeFlow Movement](community/freeflow_movement/freeflow_movement.md) + - [Community Principles](community/community_principles/community_principles.md) +- [Farming](farming/farming.md) +- [Tech](ffself_specs/tech.md) + - [Actor Based Development](ffself_specs/actor_based/actor_based_approach.md) + - [FreeFlow Self](ffself_specs/freeflowself/freeflowself.md) + - [Social Network Tech](ffself_specs/others/others.md) + - [Nostr Protocol](ffself_specs/others/nostr.md) + - [Activity Pub](ffself_specs/others/activitypub.md) + - [Market Status](ffself_specs/others/comparison.md) + - [Vlang](ffself_specs/vlang/vlang.md) +- [What do we resolve](problems/resolve_a_problem.md) + - [complex onions](problems/painkiller/onion_layers.md) + - [painkillers](problems/painkiller/no_pain_killer.md) + - [clouds are complicated](problems/internet_infra/cloud_issues.md) + - [content delivery expensive](problems/internet_infra/cdn_issues.md) + - [amazon pricing](problems/internet_infra/cdn_pricing_amazon.md) + - [google pricing](problems/internet_infra/cdn_pricing_google.md) diff --git a/collections/problems/problems.md b/collections/community/.collection similarity index 100% rename from collections/problems/problems.md rename to collections/community/.collection diff --git a/collections/community/community.md b/collections/community/community.md new file mode 100644 index 0000000..005524c --- /dev/null +++ b/collections/community/community.md @@ -0,0 +1,2 @@ +# Community + diff --git a/collections/why/community_principles/community_principles.md b/collections/community/community_principles/community_principles.md similarity index 100% rename from collections/why/community_principles/community_principles.md rename to collections/community/community_principles/community_principles.md diff --git a/collections/why/community_principles/img/principles_01.png b/collections/community/community_principles/img/principles_01.png similarity index 100% rename from collections/why/community_principles/img/principles_01.png rename to collections/community/community_principles/img/principles_01.png diff --git a/collections/why/community_principles/img/principles_02.png b/collections/community/community_principles/img/principles_02.png similarity index 100% rename from collections/why/community_principles/img/principles_02.png rename to collections/community/community_principles/img/principles_02.png diff --git a/collections/why/community_principles/img/principles_03_.jpg b/collections/community/community_principles/img/principles_03_.jpg similarity index 100% rename from collections/why/community_principles/img/principles_03_.jpg rename to collections/community/community_principles/img/principles_03_.jpg diff --git a/collections/why/community_principles/img/principles_04.png b/collections/community/community_principles/img/principles_04.png similarity index 100% rename from collections/why/community_principles/img/principles_04.png rename to collections/community/community_principles/img/principles_04.png diff --git a/collections/why/community_principles/img/principles_05_.jpg b/collections/community/community_principles/img/principles_05_.jpg similarity index 100% rename from collections/why/community_principles/img/principles_05_.jpg rename to collections/community/community_principles/img/principles_05_.jpg diff --git a/collections/why/community_principles/img/principles_06.png b/collections/community/community_principles/img/principles_06.png similarity index 100% rename from collections/why/community_principles/img/principles_06.png rename to collections/community/community_principles/img/principles_06.png diff --git a/collections/why/community_principles/img/principles_07.png b/collections/community/community_principles/img/principles_07.png similarity index 100% rename from collections/why/community_principles/img/principles_07.png rename to collections/community/community_principles/img/principles_07.png diff --git a/collections/why/community_principles/img/principles_08_.jpg b/collections/community/community_principles/img/principles_08_.jpg similarity index 100% rename from collections/why/community_principles/img/principles_08_.jpg rename to collections/community/community_principles/img/principles_08_.jpg diff --git a/collections/why/community_principles/img/principles_09.png b/collections/community/community_principles/img/principles_09.png similarity index 100% rename from collections/why/community_principles/img/principles_09.png rename to collections/community/community_principles/img/principles_09.png diff --git a/collections/why/community_principles/img/principles_10.png b/collections/community/community_principles/img/principles_10.png similarity index 100% rename from collections/why/community_principles/img/principles_10.png rename to collections/community/community_principles/img/principles_10.png diff --git a/collections/why/freeflow_movement/freeflow_movement.md b/collections/community/freeflow_movement/freeflow_movement.md similarity index 100% rename from collections/why/freeflow_movement/freeflow_movement.md rename to collections/community/freeflow_movement/freeflow_movement.md diff --git a/collections/why/freeflow_movement/img/freeflow_movement_.jpg b/collections/community/freeflow_movement/img/freeflow_movement_.jpg similarity index 100% rename from collections/why/freeflow_movement/img/freeflow_movement_.jpg rename to collections/community/freeflow_movement/img/freeflow_movement_.jpg diff --git a/collections/farming/.collection b/collections/farming/.collection new file mode 100644 index 0000000..e69de29 diff --git a/collections/solutions/farming/farming.md b/collections/farming/farming.md similarity index 100% rename from collections/solutions/farming/farming.md rename to collections/farming/farming.md diff --git a/collections/solutions/farming/img/bl_7840.png b/collections/farming/img/bl_7840.png similarity index 100% rename from collections/solutions/farming/img/bl_7840.png rename to collections/farming/img/bl_7840.png diff --git a/collections/solutions/farming/img/bl_7840b.png b/collections/farming/img/bl_7840b.png similarity index 100% rename from collections/solutions/farming/img/bl_7840b.png rename to collections/farming/img/bl_7840b.png diff --git a/collections/solutions/farming/img/bl_7840c.png b/collections/farming/img/bl_7840c.png similarity index 100% rename from collections/solutions/farming/img/bl_7840c.png rename to collections/farming/img/bl_7840c.png diff --git a/collections/solutions/farming/img/bl_silver.png b/collections/farming/img/bl_silver.png similarity index 100% rename from collections/solutions/farming/img/bl_silver.png rename to collections/farming/img/bl_silver.png diff --git a/collections/ffself_specs/others/others.md b/collections/ffself_specs/others/others.md new file mode 100644 index 0000000..e69de29 diff --git a/collections/ffself_specs/tech.md b/collections/ffself_specs/tech.md new file mode 100644 index 0000000..e69de29 diff --git a/collections/problems/resolve_a_problem.md b/collections/problems/resolve_a_problem.md new file mode 100644 index 0000000..bddd1aa --- /dev/null +++ b/collections/problems/resolve_a_problem.md @@ -0,0 +1,2 @@ +# What do we resolve + diff --git a/collections/problems/social_warming/img/africa_young.png b/collections/why/social_warming/img/africa_young.png similarity index 100% rename from collections/problems/social_warming/img/africa_young.png rename to collections/why/social_warming/img/africa_young.png diff --git a/collections/problems/social_warming/img/social_warming.png b/collections/why/social_warming/img/social_warming.png similarity index 100% rename from collections/problems/social_warming/img/social_warming.png rename to collections/why/social_warming/img/social_warming.png diff --git a/collections/problems/social_warming/img/toabondance.png b/collections/why/social_warming/img/toabondance.png similarity index 100% rename from collections/problems/social_warming/img/toabondance.png rename to collections/why/social_warming/img/toabondance.png diff --git a/collections/problems/social_warming/img/world_behind.png b/collections/why/social_warming/img/world_behind.png similarity index 100% rename from collections/problems/social_warming/img/world_behind.png rename to collections/why/social_warming/img/world_behind.png diff --git a/collections/problems/social_warming/social_warming.md b/collections/why/social_warming/social_warming.md similarity index 100% rename from collections/problems/social_warming/social_warming.md rename to collections/why/social_warming/social_warming.md diff --git a/script3/actions.md b/script3/actions.md index fe26978..1cf8951 100644 --- a/script3/actions.md +++ b/script3/actions.md @@ -6,7 +6,7 @@ ```js //will run all books, can also do name:'mybooka,mybook2' -// !!books.generate +!!books.generate // !!books.pull // !!book.edit name:'datacenter' diff --git a/script3/asimov.md b/script3/asimov.md deleted file mode 100644 index 61c44b5..0000000 --- a/script3/asimov.md +++ /dev/null @@ -1,15 +0,0 @@ - - -```js - -!!book.define name:'asimov' title:'Asimovs Internet 4.0' - url:'https://git.ourworld.tf/threefold_coop/info_asimov/src/branch/main/asimov' - - -!!book.collection_add book:'asimov' name:'asimov' - url:'https://git.ourworld.tf/threefold_coop/info_asimov/src/branch/main/asimov' - - - -``` - diff --git a/script3/book_collections.md b/script3/book_collections.md new file mode 100644 index 0000000..61c7636 --- /dev/null +++ b/script3/book_collections.md @@ -0,0 +1,15 @@ + + +```js + +!!book.define name:'duniayetu' title:'Dunia Yetu Internet 4.0' + url:'https://git.ourworld.tf/threefold_coop/info_threefold_coop/src/branch/main/books/duniayetu_dar' + + +!!book.collections_add book:'duniayetu' + url:'https://git.ourworld.tf/threefold_coop/info_threefold_coop/src/branch/main/collections' + + + +``` + diff --git a/sync_production.sh b/sync_production.sh index 9a1ccd2..d8b83c0 100755 --- a/sync_production.sh +++ b/sync_production.sh @@ -1,3 +1,3 @@ #!/bin/bash -/bin/bash ~/hero/var/mdbuild/asimov/build.sh -rsync -rav ~/hero/www/info/asimov/ root@info.ourworld.tf:/root/hero/www/info/tfcoop/ \ No newline at end of file +/bin/bash ~/hero/var/mdbuild/duniayetu/build.sh +rsync -rav ~/hero/www/info/duniayetu/ root@info.ourworld.tf:/root/hero/www/info/duniayetu/ \ No newline at end of file