Merge branch 'master' into dev

# Conflicts:
#	src/cyber/Cyber.js

LICENSE

@@ -1,21 +1,3 @@
-MIT License
+Cyber License
 
-Copyright (c) 2018 cyber•Congress
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Don’t believe, don’t fear, don’t ask.

README.md

@@ -52,8 +52,8 @@ If you have any problems with or questions about CYB, please contact us through
 [GitHub issue](https://github.com/cybercongress/cyb/issues).
 
 ## Gitcoin Tasks
-<a href="https://gitcoin.co/explorer?q=cyber-browser">
-    <img src="https://gitcoin.co/funding/embed?repo=https://github.com/cybercongress/cyber-browser">
+<a href="https://gitcoin.co/explorer?q=cyb">
+    <img src="https://gitcoin.co/funding/embed?repo=https://github.com/cybercongress/cyb">
 </a>
 
 ## Contribute
@@ -62,9 +62,9 @@ You are invited to contribute new features, fixes, or updates, large or small; W
 requests, and do our best to process them as fast as We can. You can find detailed information in our
 [contribution guide](./CONTRIBUTION.md).
 
-## Roadmap & Changelog
+## Roadmap
 
-Stay tuned with our [Changelog](./CHANGELOG.md) and [Roadmap](https://github.com/orgs/cybercongress/projects/1).
+Stay tuned with our [Roadmap](https://github.com/orgs/cybercongress/projects/1).
 
 ## Join Us On Telegram
 

docs/cyb.md

@@ -8,30 +8,65 @@ Concept. Definitions are work in progress.
 
 ## Abstract
 
-Cyb is a friendly software robot who helps you explore the universes. Put it simply it just a [web3](cyb://QmXHiEVCFTN8hda93qZN6ay5bXJ1ZkaLCV68AefXPs1pXg.ipfs) browser. At the very beginning cyb is focusing on developers and advanced blockchain users who are able to work with private keys and transactions. But we see how Cyb becomes friendly for everyone who wants to interact with consensus computers in a web of the third generation. This new web is designed to free developers from outdated things such as html and v8. So developers can use any markup, execution and rendering engine they wish. That is why we don't focus on implementation of mentioned things. Instead this paper discuss implementation agnostic concepts of browser that are simple enough to be adopted by web3 developers. Initially we design Cyb for conventional desktop browsing. But suggested concepts can be easily used for mobile, voice, vr and robotics implementations.
+Cyb is a friendly software robot who helps you explore the universes.
+Put it simply it just a [web3](cyb://QmXHiEVCFTN8hda93qZN6ay5bXJ1ZkaLCV68AefXPs1pXg.ipfs) browser.
+At the very beginning Cyb is focusing on developers and advanced blockchain users who are able to work with private keys and transactions.
+But we see how Cyb becomes friendly for everyone who wants to interact with consensus computers in a web of the third generation.
+This new web is designed to free developers from outdated things such as html and v8.
+So developers can use any markup, execution and rendering engine they wish.
+That is why we don't focus on implementation of mentioned things.
+Instead this paper shows implementation agnostic concepts of browser that are simple enough to be adopted by web3 developers.
+Initially we design Cyb for conventional desktop browsing.
+But suggested concepts can be easily used for mobile, voice, VR and robotics implementations.
 
 ## Introduction
 
-Current state of web3 experience is non satisfactory. Still [we did not meet](https://github.com/cybercongress/cyb/blob/master/docs/comparison.md) any piece of software that is able to deliver deep, emotional web3 experience. So we decide to bring to the table one contender that strictly follows web3 principles defined by ourselves ;-) In a rush for this passion we define the following web3 apps which we believe together implement the full web3 vision in the context of a browsing for web3 agents and app developers:
-
-- `.main`: main page for every joe
-- `.path`: navigation bar and its backend
-- `.connect`: connection manager and state widget
-- `.keys`: keystore interface and id widget
-- `.cyber`: cyberd node manager and app for link chains
-- `.pins`: favourites backend and application bar
-- `.sign`: phishing resistant signer for messages and transactions with scheduler
-- `.crr`: cyb root registry
-- `.cyb`: origianl web3 appstore
-- `.access`: permission manager that respects agents' resources
-- `.feed`: notification backend and feed app
+Current state of web3 experience is non satisfactory.
+We still [didn't meet](https://github.com/cybercongress/cyb/blob/master/docs/comparison.md) any piece of software that is able to deliver deep and emotional web3 experience. So we decide to bring to the table one contender that strictly follows web3 principles defined by ourselves ;-) 
+In a rush for this passion we define the following web3 apps which we believe together implement the full web3 vision in the context of a browsing for web3 agents and app developers:
+
+## CLI
+
+
+## Shell
+
+Here are the default UX elements, that Cyb uses to provide basic web3 UX:
+
+- `Navigation bar` - search field, back & forward buttons
+- `App Bar` - list of pinned favourites apps
+- `ID Bar` - main identity data
+- `State Bar` - node connection statuses
+
+## .cyb
+
+Cyb has a lot of user and technical settings. They are implemented in the core browser app - .cyb:
+
+- `main.cyb`: main page for every joe
+- `path.cyb`: user's navigation history
+- `txq.cyb` : user's transaction activity
+- `pins.cyb`: pinned user's favourite apps and pages
+- `connect.cyb`: connection manager
+
+- `root.cyb`: cyb root registry
+- `help.cyb`: cyb educational library and feedback mechanism
+- `dev.cyb`: web3 development tool with support of contracts
+
+- `keys.cyb`: keystore interface
+- `sign.cyb`: phishing resistant signer for messages and transactions with scheduler
+- `wallet.cyb`: universal wallet
+
+- `feed.cyb`: notification & feed app
+- `access.cyb`: permission manager that respects agents' resources
+
+## Apps
+
+Main apps for initial web3 experience
+
+- `.cyber`: cyberd node manager and app for link chains + - `apps.cyber`: search appstore - 
 - `.ipfs`: ipfs node manager and agent experience
 - `.eth`: ethereum node manager + ens resolver
-- `.wallet`: universal wallet ux
-- `.help`: cyb educational library and feedback mechanism
-- `.dev`: web3 development tool with support of contracts
-- `.cg`: all the things chaingearable
-- `.settings`: cyb settings
+- `.chaingear`: all the things chaingearable
+- `.wiki`: wiki indexator
 
 All this apps are considered as core apps and are included in every Cyb distribution. Let us describe in details every app as a pure concept.