Merge pull request #212 from open-source-labs/staging

Merge Staging into Master

Author: kevinfey

README.md

@@ -4,7 +4,7 @@
 
 <h1 align="center"><b>State Debugger for React</b></h1>
 
-[![GitHub](https://img.shields.io/github/license/oslabs-beta/reactime)](https://github.com/oslabs-beta/reactime) [![Build Status](https://travis-ci.com/oslabs-beta/reactime.svg?branch=master)](https://travis-ci.com/oslabs-beta/reactime) [![npm version](https://badge.fury.io/js/reactime.svg)](http://badge.fury.io/js/reactime) [![Dependencies](https://david-dm.org/oslabs-beta/reactime.svg)](https://david-dm.org/oslabs-beta/reactime#info=dependencies) [![DevDependencies](https://david-dm.org/oslabs-beta/reactime/dev-status.svg)](https://david-dm.org/oslabs-beta/reactime?type=dev) [![Vulnerabilities](https://snyk.io/test/github/oslabs-beta/reactime/badge.svg)](https://snyk.io/test/github/oslabs-beta/reactime)![BabelPresetPrefs](https://img.shields.io/badge/babel%20preset-airbnb-ff69b4)![LintPrefs](https://img.shields.io/badge/linted%20with-eslint-blueviolet)
+[![GitHub](https://img.shields.io/github/license/oslabs-beta/reactime)](https://github.com/oslabs-beta/reactime) [![Build Status](https://travis-ci.com/oslabs-beta/reactime.svg?branch=master)](https://travis-ci.com/oslabs-beta/reactime) [![npm version](https://badge.fury.io/js/reactime.svg)](http://badge.fury.io/js/reactime) [![Vulnerabilities](https://snyk.io/test/github/oslabs-beta/reactime/badge.svg)](https://snyk.io/test/github/oslabs-beta/reactime)![BabelPresetPrefs](https://img.shields.io/badge/babel%20preset-airbnb-ff69b4)![LintPrefs](https://img.shields.io/badge/linted%20with-eslint-blueviolet)
 
 <p align="center">
 <img src="./assets/hooks-demo.gif" />

package.json

@@ -133,4 +133,4 @@
     "recoil": "0.0.10",
     "sankey": "^2.0.2"
   }
-}
+}

src/app/components/StateRoute.tsx

@@ -135,7 +135,7 @@ const StateRoute = (props: StateRouteProps) => {
             activeClassName="is-active"
             to="/relationship"
           >
-            Relationships
+            Data Flow
           </NavLink>
         )}
 

src/app/containers/MainContainer.tsx

@@ -89,10 +89,9 @@ function MainContainer(): any {
     if (!user.debug) {
       //set current user cookie if it does not exist in cookies;
       if (user.checkDocumentCookie(document)) {
-        user.getCookie();
         mixpanel.people.increment(user.get_dId(), "times");
       } else {
-        user.setCookie();
+        document.cookie = user.setCookie();
         mixpanel.people.set(user.get_dId(), { times: 1 });
       }
     }

src/app/user_id/user_id.js

@@ -12,7 +12,6 @@ class MPID{
     //create a string of random data        
     this.cookie = cookie.serialize("reactime", crypto.randomBytes(64).toString('hex') );
     this.distinct_id = this.cookie?.reactime?.slice(0, 20);
-    
     if(this.cookie){
       return this.cookie;    
     }else{
@@ -22,7 +21,8 @@ class MPID{
   }
 
   getCookie(){    
-    if(this.cookie){   
+    if(this.cookie){
+      //this.distinct_id = parsedCookie?.reactime?.slice(0, 20);   
       return this.cookie;
     }else{
       throw new Error("Cookie truthy, but unreturnable");
@@ -37,7 +37,8 @@ class MPID{
       this.cookie = parsedCookie?.reactime;      
       if(!this.distinct_id){        
         this.distinct_id = parsedCookie?.reactime?.slice(0, 20);
-      }    
+      }
+      return true;    
     }else{      
       this.setCookie();
       return false;
@@ -48,6 +49,9 @@ class MPID{
     try{
       if(this.distinct_id ) {        
         return this.distinct_id;
+      }else{
+
+        //return this.checkDocumentCookie
       }
     }catch( e ){
       throw new Error(`unable to set cookie. Reason: ${e}. `);