Merge Dev to Master branch

email_app/.compilerc

@@ -0,0 +1,33 @@
+{
+"application/javascript": {
+  "presets": [
+    ["env", { "targets": { "electron": "1.6.0" } }],
+    "es2015",
+    "stage-0",
+    "react"
+  ],
+  "sourceMaps": "none",
+  "env": {
+    "development": {
+        "plugins": [
+          "transform-async-to-generator",
+          "transform-class-properties",
+          "transform-es2015-classes",
+          "react-hot-loader/babel"
+        ],
+        "sourceMaps": "inline"
+      },
+      "production": {
+        "plugins": [
+          "transform-async-to-generator",
+          "transform-class-properties",
+          "transform-es2015-classes",
+          "react-optimize"
+        ]
+      }
+    }
+  },
+  "text/less": {
+    "dumpLineNumbers": "comments"
+  }
+}

email_app/.gitignore

@@ -8,3 +8,4 @@ Thumbs.db
 /dist
 /main.js
 /main.js.map
+/out

email_app/README.md

@@ -1,36 +1,51 @@
 # Safe Mail Tutorial Application
 
-The tutorial app show cases how to use the low level API from launcher to
-build a simple email application.
+The tutorial app show cases how to use the low level API from `safe_app_nodejs`
+library to build a simple email application.
 
-Demonstrates the usage of
- - Private AppendableData
- - StructuredData
+Demonstrates the usage of:
+ - Private MutableData
+ - Public MutableData
  - Immutable data
+ - App's home container
+ - `_publicNames` and services containers
 
-Requires [safe_launcher](https://github.com/maidsafe/safe_launcher) version 0.9.1
+Please refer to the [Application Data Model](#application-data-model) section below for additional details.
 
 ## Install
 
-First, clone the repo and then install dependencies.
+First, clone the repository:
 
 ```bash
-$ cd your-project-name && npm install
+$ cd your-project-name
 ```
 
-## Run
+And then install the dependencies:
+
+```bash
+$ npm install
+```
+
+If you are working on a development environment, you can run the command below instead, in order to get the `safe_client` libraries that use the `MockVault` file rather than connecting to the SAFE Network:
+
+```bash
+$ NODE_ENV=dev npm install
+```
 
-Run this two commands __simultaneously__ in different console tabs.
+## Run
 
 ```bash
-$ npm run hot-server
-$ npm run start-hot
+$ npm start
 ```
 
-or run two servers with one command
+This starts the app in development mode with hot-reloading.
+
+### Faking Authentication
+
+If you don't have authenticator set up and want to run the test with randomly generated testing credentials, run it as:
 
 ```bash
-$ npm run dev
+$ NODE_ENV=development SAFE_FAKE_AUTH=1 npm start
 ```
 
 *Note: requires a node version >= 4 and an npm version >= 2.*
@@ -63,3 +78,9 @@ To package apps with options:
 ```bash
 $ npm run package -- --[option]
 ```
+
+## Application Data Model
+
+The following diagram depicts how the emails are stored in the SAFE network, as well as how the email app stores email accounts information.
+
+![Email App Data Model](./design/EmailApp-DataModel.png)

email_app/app/actions/actionTypes.js

@@ -1,52 +1,26 @@
 const ACTION_TYPES = {
+  // Initializer
   AUTHORISE_APP: 'AUTHORISE_APP',
-  GET_CONFIG_FILE: 'GET_CONFIG_FILE',
-  WRITE_CONFIG_FILE: 'WRITE_CONFIG_FILE',
-  FETCH_DATA_ID_AT: 'FETCH_DATA_ID_AT',
-  SET_CREATE_ACCOUNT_PROCESSING: 'SET_CREATE_ACCOUNT_PROCESSING',
-  SET_CREATE_ACCOUNT_ERROR: 'SET_CREATE_ACCOUNT_ERROR',
-  CREATE_STRUCTURED_DATA: 'CREATE_STRUCTURED_DATA',
-  UPDATE_STRUCTURED_DATA: 'UPDATE_STRUCTURED_DATA',
-  FETCH_STRUCTURED_DATA: 'FETCH_STRUCTURED_DATA',
-  FETCH_STRUCTURE_DATA_HANDLE: 'FETCH_STRUCTURE_DATA_HANDLE',
-  DROP_STRUCTURED_DATA_HANDLE: 'DROP_STRUCTURED_DATA_HANDLE',
-  FETCH_STRUCTURE_DATA_ID_HANDLE: 'FETCH_STRUCTURE_DATA_ID_HANDLE',
-  POST_STRUCTURED_DATA: 'POST_STRUCTURED_DATA',
-  PUT_STRUCTURED_DATA: 'PUT_STRUCTURED_DATA',
+  FETCH_EMAIL_IDS: 'FETCH_EMAIL_IDS',
+  GET_CONFIG: 'GET_CONFIG',
+  REFRESH_EMAIL: 'REFRESH_EMAIL',
   SET_INITIALIZER_TASK: 'SET_INITIALIZER_TASK',
-  SET_APPENDABLE_DATA_ID: 'SET_APPENDABLE_DATA_ID',
-  CREATE_APPENDABLE_DATA: 'CREATE_APPENDABLE_DATA',
-  FETCH_APPENDABLE_DATA_META: 'FETCH_APPENDABLE_DATA_META',
-  FETCH_APPENDABLE_DATA_HANDLER: 'FETCH_APPENDABLE_DATA_HANDLER',
-  APPEND_APPENDABLE_DATA: 'APPEND_APPENDABLE_DATA',
-  REMOVE_FROM_APPENDABLE_DATA: 'REMOVE_FROM_APPENDABLE_DATA',
-  POST_APPENDABLE_DATA: 'POST_APPENDABLE_DATA',
-  PUT_APPENDABLE_DATA: 'PUT_APPENDABLE_DATA',
-  DROP_APPENDABLE_DATA_HANDLE: 'DROP_APPENDABLE_DATA_HANDLE',
-  CLEAR_DELETE_DATA: 'CLEAR_DELETE_DATA',
-  GET_APPENDABLE_DATA_LENGTH: 'GET_APPENDABLE_DATA_LENGTH',
-  CREATE_IMMUT_WRITER_HANDLE: 'CREATE_IMMUT_WRITER_HANDLE',
-  GET_IMMUT_READ_HANDLE: 'GET_IMMUT_READ_HANDLE',
-  CLOSE_IMMUT_DATA_READER: 'CLOSE_IMMUT_DATA_READER',
-  READ_IMMUT_DATA: 'READ_IMMUT_DATA',
-  WRITE_IMMUT_DATA: 'WRITE_IMMUT_DATA',
-  CLOSE_IMMUT_DATA_WRITER: 'CLOSE_IMMUT_DATA_WRITER',
-  PUT_IMMUT_DATA: 'PUT_IMMUT_DATA',
+  STORE_NEW_ACCOUNT: 'STORE_NEW_ACCOUNT',
+  NET_STATUS_CHANGED: 'NET_STATUS_CHANGED',
+  RECONNECT_APP: 'RECONNECT_APP',
+
+  // Create Account
+  CREATE_ACCOUNT: 'CREATE_ACCOUNT',
+  CREATE_ACCOUNT_ERROR: 'SET_CREATE_ACCOUNT_ERROR',
+
+  // Mail Inbox
   PUSH_MAIL: 'PUSH_MAIL',
-  SET_MAIL_PROCESSING: 'SET_MAIL_PROCESSING',
-  CLEAR_MAIL_PROCESSING: 'CLEAR_MAIL_PROCESSING',
+  MAIL_PROCESSING: 'MAIL_PROCESSING',
   SET_ACTIVE_MAIL: 'SET_ACTIVE_MAIL',
-  SERIALISE_DATA_ID: 'SERIALISE_DATA_ID',
-  DESERIALISE_DATA_ID: 'DESERIALISE_DATA_ID',
-  GET_STRUCTURED_DATA_ID_HANDLE: 'GET_STRUCTURED_DATA_ID_HANDLE',
-  DROP_HANDLER: 'DROP_HANDLER',
-  GET_ENCRYPTED_KEY: 'GET_ENCRYPTED_KEY',
-  DELETE_ENCRYPTED_KEY: 'DELETE_ENCRYPTED_KEY',
-  GET_CIPHER_OPTS_HANDLE: 'GET_CIPHER_OPTS_HANDLE',
-  DELETE_CIPHER_OPTS_HANDLE: 'DELETE_CIPHER_OPTS_HANDLE',
+
   CANCEL_COMPOSE: 'CANCEL_COMPOSE',
-  CLEAR_INBOX: 'CLEAR_INBOX',
-  PUSH_TO_INBOX: 'PUSH_TO_INBOX'
+  PUSH_TO_INBOX: 'PUSH_TO_INBOX',
+  PUSH_TO_ARCHIVE: 'PUSH_TO_ARCHIVE'
 };
 
 export default ACTION_TYPES;