Merge remote-tracking branch 'origin/master'

Author: Naraujo13

.editorconfig

@@ -0,0 +1,10 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true

.eslintrc.json

@@ -0,0 +1,13 @@
+{
+  "parser": "babel-eslint",
+  "env": {
+    "node": true,
+    "jest": true
+  },
+  "extends": ["airbnb-base", "plugin:prettier/recommended"],
+  "rules": {
+    "global-require": "off",
+    "no-underscore-dangle": "off",
+    "sort-keys": ["error", "asc"]
+  }
+}

.prettierrc.yml

@@ -0,0 +1,6 @@
+semi: true
+trailingComma: 'all'
+useTabs: false
+tabWidth: 2
+singleQuote: false
+editor.formatOnSave: true

README.md

@@ -4,10 +4,9 @@
     <img src="https://scontent.fpet1-1.fna.fbcdn.net/v/t1.0-1/91397488_120087589636900_7236983386537984000_n.jpg?_nc_cat=110&_nc_sid=dbb9e7&_nc_oc=AQn7ohukMj_QASvuajKWQMsT4Qh3l4ca2TfJcR1yAkm6HDWwhdxl2CwRJcuBKmegtOlT5MH0FBjlGS-c2Vb2f65w&_nc_ht=scontent.fpet1-1.fna&oh=df1b3022c1fc626fdba3a7e3c4c8fede&oe=5EC0C3FE" alt="FightPademics logo" title="FightPandemics" align="right" height="70" />
 </a>
 
-FightPandemics Data Model
-======================
-<br />
+# FightPandemics Data Model
 
+<br />
 
 Repository holding the data model specified as json document, json schema and with its html and pdf documentation.
 
@@ -17,7 +16,7 @@ The data model is versioned, with the current live version being [v1](/v1) and w
 ## Diagram for the Data Model v2
 
 <p align="center">
-  <img width="650" height="423" src="images/diagram_model.png">
+  <img width="650" src="images/diagram_model.png">
 </p>
 <br />
 
@@ -30,6 +29,7 @@ There is also an [excel spreadsheet version](v2/docs/FightPandemics.xlsx).
 <br />
 
 ## Sample of the documentation
+
 <p align="center">
   <img height='500' src="images/sample_documentation.jpg">
 </p>
@@ -43,4 +43,56 @@ There are [MongoDB Scripts](v2/scripts/MongoDB_Script) available for collection
 
 Mongoose scripts are in the roadmap for the near future.
 
+# Collections
+
+## Users
+
+Collection that holds all the data on system's users.
+
+The users can be of **two types**: **(1) Individual**, representing a private user account; and **(2) Organization**, representing an organization of various types.
+
+The field 'type' is used to differentiate between the two subschemas, with 'individual' representing private user accounts and "Community", "Government", "Health care provider", "Non-profit", "Other", "R&D", "Startup", "Traditional Company" and "University".
+
+For more detailed information, please visit the [documentation](v2/docs/FightPandemics_documentation.html).
+
+<br />
+<p align="center">
+  <img src="images/users_collection.png">
+</p>
+<br />
+
+## Posts
+
+Document to represent a post, asking or offering help to be displayed on the feed. A post can be created by any user, wether it is an individual or an organization. A post can have it's visibility limited geographically and have an expiration date set.
+
+For more detailed information, please visit the [documentation](v2/docs/FightPandemics_documentation.html).
+
+<br />
+<p align="center">
+  <img src="images/posts_collection.png">
+</p>
+<br />
+
+## Comments
+
+Document that represents a comment made at a post. A comment can be made by an individual user or an organization.
+
+For more detailed information, please visit the [documentation](v2/docs/FightPandemics_documentation.html).
+
+<br />
+<p align="center">
+  <img src="images/comments_collection.png">
+</p>
+<br />
+
+## Feedback
+
+Document that represents a feedback sent by an user, logged or not.
+
+For more detailed information, please visit the [documentation](v2/docs/FightPandemics_documentation.html).
 
+<br />
+<p align="center">
+  <img src="images/feedbacks_collection.png">
+</p>
+<br />