diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c56c11..3a092fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
# Changelog
-Sprint is **weekly**.
+Sprint is **weekly**. Outside of holidays, sprint call is **every first working day of the week.**
## Initializing 2020/12/21 [Unreleased](https://github.com/Degenics)
@@ -45,7 +45,6 @@ Sprint is **weekly**.
- UX tweaks (Jean-Daniel Gauthier, contributor)
-
## Prototyping 2021/1/4 [Unreleased](https://github.com/Degenics)
### Full Changelog
@@ -86,20 +85,55 @@ Sprint is **weekly**.
- Progress bar
-
**Demo Video**
[](https://www.youtube.com/watch?v=qTyi8Zg8W_A&)
-**Performance Notes**
+**Platform/Performance Notes**
- Team will explore using metamask for a better user experience and performance optimization.
+- (Added 2020/01/06) Team will explore using Polkadot
**UX Notes**
- General simplification required for next sprint
- User feedback and anti-frustration features (Jean-Daniel Gauthier, contributor)
-**UX Notes, screenshots of Figma mockup with revisions for next sprint (Jean-Daniel Gauthier, contributor):**
- 
- 
- 
- 
- 
\ No newline at end of file
+(added 2020/01/06) **UX Notes, screenshots of Figma mockup with revisions for next sprint (Jean-Daniel Gauthier, contributor):**
+ 
+ Screens:
+ - [1](/media/DA01-5.PNG)
+ - [2](/media/DA01-4.PNG)
+ - [3](/media/DA01-3.PNG)
+ - [4](/media/DA01-2.PNG)
+ - [5](/media/DA01-1.PNG)
+
+
+## Prototyping 2021/1/14 [Unreleased](https://github.com/Degenics)
+**Demo Video**
+ [](https://drive.google.com/file/d/1TB9RJz_FCDe8vIvvc41j0s1LYC9Oc3Ka/view)
+
+
+## Prototyping 2021/1/18 [Unreleased](https://github.com/Degenics)
+
+### Full Changelog
+
+**Development**
+
+- Front End
+ - (2021/1/5) Use custom Wallet class for faster encrypt decrypt and wallet generation
+ - (2021/1/7) Update login page: update login page design, add confirm password validation, gitignore local contract.json
+ - (2021/1/8) Update receipt page design: add DNA sample sending instruction, add helper to format specimen number; Handle and show send payment error message
+ - (2021/1/9) Update request test page: fix the numbering in DNA sample sending instructions, resize selected product icon, set product selection limit, parse additionalData from lab and services data, show lab address if any
+ - (2021/1/12) Update user dashboard & user request test: set max view limit for order history and test result fix order history sorting, disabled unselected product card; Update style: update style for order history and lab order list; Fix order history sorting at user dashboard
+ - (2021/1/13) Deployment changes: Create multi stage docker compose and config nginx
+ - (2021/1/14) Move to testnet: fix ethereum tx issue, fix send transaction when register speciment; Change IPFS connection;
+ - (2021/1/15) Fix authentication flow: add route guards to check if logged in, sdd route guards to check user role when app start, move load web3 and contracts to router so to be able to access; Refactor; Connect to web3 and setup contracts before app renders; Fix flow in lab: change upload to result and genome, fix finalize to new method, fix bug crash on lab order list
+ - (2021/1/17) Update lab's dashboard: Modified lab's dashboard home datatable to show next actions, add Process Screen to process specimen, Receive -> Wetwork -> Encrypt Upload Files -> Send (Set specimen status to success) workflow
+ - (2021/1/18) Create order detail and all result: create page for w all result, create page for order detail, link page to dashboard; Create result: create result parser, create download result, create download genome; Update success & reject flow: show reject alert after rejecting speciment, show success alert after set speciment status to success
+
+- Smart Contract
+ - (2021/1/6) Add timestamp
+ - (2021/1/9) Add dummy services data
+ - (2021/1/11) Add escrow reg
+ - (2021/1/13) Update skin product to skin care
+
+- Demo
+ - https://drive.google.com/file/d/1Rk0AZ1qMIUMhtZ2M_BKcpeV_mHnPmFWF/view?usp=sharing
diff --git a/Degenics.md b/Degenics.md
new file mode 100644
index 0000000..7010379
--- /dev/null
+++ b/Degenics.md
@@ -0,0 +1,97 @@
+# Degenics in a nutshell
+
+## A privacy first, anonymous genetic sequencing and analysis platform
+
+Degenics aims at providing anonymous and privacy-guaranteed genetic testing for a wide range of uses, from personal wellness to disease detection.
+
+Degenics is a decentralized platform that brings institutional or independent PCR operators together with health specialist in order to deliver genome sequencing and its analysis, and uses cryptography to make sure those results are private to consumers.
+
+# WHY?
+
+## To provide an alternative to centralized personal genetic testing services, an alternative where privacy is enforced at infrastructure level, where users control their data from sending to monetization
+
+## To empower labs everywhere possible by adding to their revenue streams and optimizing their PCR equipment yield
+
+## To provide consumers with a stigma-free, private and anonymous health service, be it for lifestyle or healthcare motives
+
+# Opportunities
+
+## A Sizable Market
+
+As per the report published by Allied Market Research, the global genetic testing market generated $12.68 billion in 2019, and is projected to reach **$21.26 billion by 2027, growing at a CAGR of 10.1% from 2020 to 2027**.
+
+## An Answers to Several Problems
+
+### **PROBLEM ** : PERSONAL GENOMICS COMPANIES OWN, MONETIZE , OR LEAK USER DATA AND PERSONAL ID.
+
+It is no secret that certain conditions and illnesses come together with social stigma. Requiring physical presence and named documents may prevent their efficient detection and/or prevention.
+
+Beyond the social aspect, personal genomics company are in possession of their user's ID, personal data and DNA analysis data. Those data, that should belong exclusively to the service's users. [These companies already sell users' genes to pharmacogenetics research with arguable consent.](https://time.com/5349896/23andme-glaxo-smith-kline/)
+
+Personal genomic companies [are already being hacked ](https://www.bloomberg.com/news/articles/2018-06-05/hack-of-dna-website-exposes-data-from-92-million-user-accounts)in certain cases.
+
+**ANSWER**: Degenics uses a blockchain based network together with additional cryptographic measures to ensure that users can remain anonymous , and the sole owners of their data. Reuse and monetization are possible, and entirely up to the users.
+
+### PROBLEM : CUSTOMERS CAN'T NORMALLY CHECK THE EFFICIENCY AN ACCURACY OF THE SEQUANCING RESULTS, UNLESS THEY HAVE THEIR OWN LABS AT HOME
+
+While it might be possible to download raw genome sequencing result from DNA analysis services, users generally do not have the means nor the knowledge to perform their own analysis. Second opinions require another end-to-end sampling, sending and analysis process, which causes time, money and further data exposure.
+
+**ANSWER**: Degenics lets users download their initial DNA sequencing files and resubmit it to health specialists on a need-to basis. As a control system users are also able to select more than one lab to generate those initial results, which contribute to mitigate inconsistencies and isolate bad potential bad actors.
+
+
+
+### PROBLEM: PCR DEVICES ARE EXPENSIVE AND NOT ALWAYS READILY AVAILABLE, WHICH DRIVES UP CONSUMER PRICES AND TESTING SERVICE YEILD
+
+Accurate PCR devices represent a real investment for heath related institutions. DIY kits do exist, but their precision level isn't enough to carry a comprehensive range of tests. As a result, waiting time and service prices are kept up.
+
+**ANSWER** : Degenics can onboard independent laboratories, universities, clinics, hospital and DYI genomics enthusiasts to create a high availability marketplace, where DIY owners see a raise in income, and users can enjoy more affordable prices.
+
+## A Wide Rage of Extended Uses
+
+### Self Data Monetization
+
+1. Users have the option to sell their non PID genetic data to parties that requires this data for research
+2. A system to protect the data and monitor access to the data is required.
+3. Purchasers of genetic data will be required to make a payment in fiat or DGNX token in order to access this data.
+4. Fiat payment that is received will be used to purchase the DGNX token from crypto markets
+5. This DGNX tokens will be re-distributed or burned according to the decision of the DAO
+
+### Health, Lifestye and Wellness Products
+
+**Genome Risk Analysis**
+
+- Disease risk analysis.
+ Know what diseases you have contracted or might contract in the future (Including COVID and SARS-Cov2
+- Descent disease risk analysis
+ Know what diseases your children might be prone to by checking your genome against your spouse's
+
+**Self Knowledge**
+
+- Your metabolism (Dietary consulting — which foods are best for your health, to prevent disease or reduce weight, exercise, skincare, personalized advice)
+- Find Physical and behavioral traits
+- Find(and monetize) your rare genes
+- Personality and character traits
+- "Find Your Super Power"
+
+**Ancestry**
+
+- Ancestry (Who do you share blood ties with?)
+- Heritage (ethnic mix and geographical family migration history)
+
+# TEAM
+
+@pandu
+
+# TECHNOLOGY
+
+## The Infrastructure
+
+@pandu
+
+## The process
+
+@pandu
+
+# FINANCIALS
+
+@AARON (we need one synthetic visual, then tell me if we should feature something else )
\ No newline at end of file
diff --git a/README.md b/README.md
index acfb057..e9c18f5 100644
--- a/README.md
+++ b/README.md
@@ -1,24 +1,95 @@
# degenics
+
# Decentralized Genetics
+
### Latest changes to main project always concurred by [CHANGELOG.md](https://github.com/Degenics/degenics-public/blob/main/CHANGELOG.md) via weekly sprint.
### This file provides the concept document for the Degenics project.
+
If you found this file somewhere else, organizational repo for the project is at [Degenics](http://github.com/Degenics) and the public-facing website is at [decentralizedgenetics.com](http://decentralizedgenetics.com).
Caveat: *The Following Concept Description is licensed via [Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International (CC BY-NC-ND 4.0)](https://creativecommons.org/licenses/by-nc-nd/4.0/), to Pandu Sastrowardoyo / [Decentricity](http://github.com/Decentricity)*
-### Elevator Pitch
+# Elevator Pitch
-#### Degenics: The Decentralized Genetics Initiative
+## Degenics: The Decentralized Genetics Initiative
We are building a decentralized platform for your personal genetics.
Our concept allows synergy between labs of all scales while guaranteeing user anonymity and sovereignty at every step of the genomic data science workflow—
from sample collection, data storage, to report generation.
-### Vision
+## Vision
We aim to democratize direct-to-consumer genomics with a privacy-preserving, anonymous-first platform running on a fully decentralized, autonomous infrastructure.
+## WHY?
+
+* **To provide an alternative to centralized personal genetic testing services, an alternative where privacy is enforced at infrastructure level, where users control their data from sending to monetization**
+* **To empower labs everywhere possible by adding to their revenue streams and optimizing their PCR equipment yield**
+* **To provide consumers with a stigma-free, private and anonymous health service, be it for lifestyle or healthcare motives**
+
+# Opportunities
+
+## A Sizable Market
+
+As per the report published by Allied Market Research, the global genetic testing market generated $12.68 billion in 2019, and is projected to reach **$21.26 billion by 2027, growing at a CAGR of 10.1% from 2020 to 2027**.
+
+## An Answers to Several Problems
+
+### **PROBLEM ** : PERSONAL GENOMICS COMPANIES OWN, MONETIZE , OR LEAK USER DATA AND PERSONAL ID.
+
+It is no secret that certain conditions and illnesses come together with social stigma. Requiring physical presence and named documents may prevent their efficient detection and/or prevention.
+
+Beyond the social aspect, personal genomics company are in possession of their user's ID, personal data and DNA analysis data. Those data, that should belong exclusively to the service's users. [These companies already sell users' genes to pharmacogenetics research with arguable consent.](https://time.com/5349896/23andme-glaxo-smith-kline/)
+
+Personal genomic companies [are already being hacked ](https://www.bloomberg.com/news/articles/2018-06-05/hack-of-dna-website-exposes-data-from-92-million-user-accounts)in certain cases.
+
+**ANSWER**: Degenics uses a blockchain based network together with additional cryptographic measures to ensure that users can remain anonymous , and the sole owners of their data. Reuse and monetization are possible, and entirely up to the users.
+
+### PROBLEM : CUSTOMERS CAN'T NORMALLY CHECK THE EFFICIENCY AND ACCURACY OF THE SEQUANCING AND ITS RESULTS, UNLESS THEY HAVE THEIR OWN LABS AT HOME
+
+While it might be possible to download raw genome sequencings from DNA analysis services, users generally do not have the means and knowledge to independently verify their accuracy. Second opinions require another end-to-end sampling, sending and analysis process, which causes time, money and further data exposure.
+
+**ANSWER**: Degenics lets users privately keep and re-share sequencing files in order to resubmit it to health specialists on a need-to basis. As a control mechanism, users are also able to select more than one lab to generate those initial results, which contribute to mitigate inconsistencies and isolate bad potential bad actors.
+
+### PROBLEM: PCR DEVICES ARE EXPENSIVE AND NOT ALWAYS READILY AVAILABLE, WHICH DRIVES UP CONSUMER PRICES AND TESTING SERVICE YIELD
+
+Accurate PCR devices represent a real investment for heath related institutions. DIY kits do exist, but their precision level isn't enough to carry a comprehensive range of tests. As a result, waiting time and service prices are kept up.
+
+**ANSWER** : Degenics can onboard independent laboratories, universities, clinics, hospital and DYI genomics enthusiasts to create a high availability marketplace, where DIY owners see a raise in income, and users can enjoy more affordable prices.
+
+## A Wide Rage of Extended Uses
+
+### Self Data Monetization
+
+1. Users have the option to sell their non PID genetic data to parties that requires this data for research
+2. A system to protect the data and monitor access to the data is required.
+3. Purchasers of genetic data will be required to make a payment in fiat or DGNX token in order to access this data.
+4. Fiat payment that is received will be used to purchase the DGNX token from crypto markets
+5. DGNX tokens will be re-distributed or burned according to the decision of the DAO
+
+### Health, Lifestye and Wellness Products
+
+Genome Risk Analysis
+
+- Disease risk analysis.
+ Know what diseases you have contracted or might contract in the future (Including COVID and SARS-Cov2
+- Descent disease risk analysis
+ Know what diseases your children might be prone to by checking your genome against your spouse's
+
+Self Knowledge
+
+- Your metabolism (Dietary consulting — which foods are best for your health, to prevent disease or reduce weight, exercise, skincare, personalized advice)
+- Find Physical and behavioral traits
+- Find(and monetize) your rare genes
+- Personality and character traits
+- "Find Your Super Power"
+
+Ancestry
+
+- Ancestry (Who do you share blood ties with?)
+- Heritage (ethnic mix and geographical family migration history)
+
### MVP Vision
Degenics 1.0 (private deployment March 2021) will provide anonymous, decentralised sample collection, payment, data storage, and report distribution.
@@ -38,8 +109,7 @@ Degenics is a group of IT consultants, blockchain developers, and biologists who
* [Kevin Janada](http://github.com/kevinjanada) - UI/UX
* Ibnu Gamal Alhadid - Advisor
-
-
+# Tech Overview
## Trustless/Fully Decentralized Model
@@ -66,6 +136,7 @@ If there is less than 10% difference between two output datasets. both are encry
User is alerted, and can access her data at any time by decrypting via private key.
## Enterprise/Consortium Model
+
### Semi-Decentralized Deployment with "Lab Marketplace"
An alternative deployment model would be the private / consortium deployment where labs are directly selected by the users.
@@ -74,21 +145,56 @@ This simplifies the workflow while maintaining the anonymity of the users. The l
Additionally, after the initial on-ramp, the labs are free to up-sell additional analytics products to the users, without resampling.
+# Financials
+
+## Circulating Token Supply
+
+* Year 0 - 2.5mil
+* Year 1 - 3.46mil
+* Year 2 - 4.1865mil
+* Year 3 - 4.913 mil
+* Year 4 - 5.6395 mil
+* Year 5 - 6.366 mil
+* Year 6 - 7.0925 mil
+* Year 7 - 7.819 mil
+* Year 8 - 8.5455 mil
+* Year 9 - 9.272 mil
+* Year 10 - 10 mil
+
+## Token Allocation
+
+1. Private Sale (20%)
+2. Team Members and Advisors (5%)
+3. DAO Allocation (20%)
+4. Marketing/Partnerships (10%)
+5. Local Support (10%)
+6. Client Incentive (10%)
+7. Hospitals/ Labs (10%)
+8. LP Provision and LP Rewards (10%)
+9. Supplies (2.5%)
+10. Airdrop and Bounties (2.5%)
+
+---
## Tech-Related FAQ
### If things are happening anonymously, how does the user/customer pay for the service?
+
There are two options, the traditional option or the fully decentralized option. We prefer fully decentralized, but this might not be an option in all locales. Traditional payment models may also work better for consortium or private deployments of Degenics.
#### Enterprise/Consortium Model
+
The traditional option: Consumer funds are held in escrow by a local payment gateway or bank until the lab provides valid data (report and genome) into decentralized storage. The smart contract then triggers fund disbursement into the lab's accounts. Note that this still maintains anonymity of the genomic data, since:
+
- Payment gateway / bank does have access to consumer KYC, but does not have access to genomic data or reports
- Labs don't have access to consumer KYC, although it does have access to anonymized genomic data.
#### Trustless/Decentralized Payments
+
All transactions happen via a Blockchain token model. Consumer onboards with their preferred cryptocurrency token, or goes through a fiat-to-crypto bridge (example here) to pay. Smart contracts hold consumer's tokens in escrow until labs provide valid data. The smart contract then triggers fund disbursement into the labs' account
### Why 2 labs? Is it for the sake of comparing the result?
+
We designed Degenics with 2 labs per transaction since we want to solve this following global problem with personal genetic testing:
Unlike other categories of services, consumers can't recheck the results of DNA analytics services unless they have access to a lab or PCR device of their own.
diff --git a/media/DA01.gif b/media/DA01.gif
new file mode 100644
index 0000000..0e5030e
Binary files /dev/null and b/media/DA01.gif differ
diff --git a/media/DegenicsAlpha02.png b/media/DegenicsAlpha02.png
new file mode 100644
index 0000000..7879e1b
Binary files /dev/null and b/media/DegenicsAlpha02.png differ