readme updated, userInfo props added, bug fixed

Author: AbhijeetNandvikar

README.md

@@ -59,6 +59,7 @@ class Example extends Component {
   render() {
     return (
       <BlinkApp
+        userInfo={{ Header: 'startup_name', accessor: 'startup_id' }}
         screen={'startupScreen'}
         view={'homeView'}
         page={'metrics'}
@@ -74,6 +75,32 @@ class Example extends Component {
 
 1. All the props passed here are stored in a global Object with the help of context API and can be accessed anywhere in the app.
 2. **screen**,**view**,**page** props are used for in app navigation. Pass the correct values to load the required page.
+3. Pass name and id of startup/investor in the format shown above in **userInfo** props.
+
+## Overall Structure of BlinkApp
+
+Pass following values to **screen**,**view**,**page** props to load required pages accordingly
+
+### Screen => startupScreen:
+
+- #### View => home
+  - page => metrics
+  - page => notes
+- #### View => tables
+  - page => revenue
+  - page => expenses
+  - page => employee
+  - page => notes
+- #### View => settings
+  - page => profile
+
+### Screen => investorScreen
+
+- #### View => dashboard
+  - page => metrics
+  - page => notes
+- #### View => settings
+  - page => profile
 
 ## License
 

example/src/App.tsx

@@ -2,15 +2,18 @@ import React from 'react'
 
 import { BlinkApp } from 'blink-npm'
 import 'blink-npm/dist/index.css'
+const token = `Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3N1ZXIiOiJoYWNrc3RyYXAiLCJhdWRpZW5jZSI6Imh0dHBzOi8vaGFja3N0cmFwLmNvbSIsImFsZ29yaXRobXMiOlsiSFMyNTYiXSwiY2xhaW1zIjp7Im9yZyI6ImhhY2tzdHJhcCJ9LCJpYXQiOjE2MjQ3ODkwNTd9.Dmo2eZKUtAOD7o7UPopoKRgma2jbESyYos8HKdU_tXk`
+const mainRoute = 'https://blink.hackstrap.com/'
 
 const App = () => {
   return (
     <BlinkApp
+      userInfo={{ Header: 'Startup 1', accessor: 'startup-1slug' }}
       screen={'startupScreen'}
       view={'homeView'}
       page={'metrics'}
-      apiRoute={''}
-      token={''}
+      apiRoute={mainRoute}
+      token={token}
     />
   )
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hackstrap/blink-npm",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "description": "This repo contains the code for blink npm pakage",
   "author": "AbhijeetNandvikar",
   "license": "MIT",

src/AppContext.tsx

@@ -1,7 +1,8 @@
 import React, { createContext, useState } from 'react'
+import { OptionInterface } from './Components/interfaces'
 interface IProps {
   children: React.ReactNode
-  userInfo?: object
+  userInfo: OptionInterface
   screen?: string
   view?: string
   page?: string
@@ -12,6 +13,7 @@ interface IProps {
 interface ValueInterface {
   // auth: object | undefined;
   // setAuth: Function;
+  userInfo: OptionInterface | undefined
   setCurrentScreen: Function
   setCurrentView: Function
   setCurrentPage: Function
@@ -24,10 +26,10 @@ interface ValueInterface {
 export const globalContext = React.createContext<ValueInterface | null>(null)
 
 const AppContext = (props: IProps) => {
-  const [auth, setAuth] = useState<object | undefined>(props.userInfo)
-  // const [currentScreen, setCurrentScreen] = useState(
-  //   props?.view ? props.view : 'startupScreen'
-  // )
+  const [userInfo, setUserInfo] = useState<OptionInterface | undefined>(
+    props.userInfo
+  )
+
   const [currentScreen, setCurrentScreen] = React.useState<string | undefined>(
     props.screen
   )
@@ -52,8 +54,7 @@ const AppContext = (props: IProps) => {
   return (
     <globalContext.Provider
       value={{
-        // auth,
-        // setAuth,
+        userInfo,
         currentScreen,
         setCurrentScreen,
         currentView,

src/Components/InvestorScreen/Dashboard/MetricsPage/MetricsPage.tsx

@@ -93,7 +93,7 @@ const MetricsPage = (props: PropsInterface) => {
         setChartInfo(chartData);
       })
       .catch((err) => console.log(err));
-  }, []);
+  }, [props.selectedStartup]);
 
   return (
     <div>

src/Components/InvestorScreen/Dashboard/NotesPage/NotesPage.tsx

@@ -102,15 +102,15 @@ const NotesPage = (props: PropsInterface) => {
         } else {
           console.log("note not avaliable, init empty note");
           setnoteData({
-            note_name: "Investor Update",
+            note_name: "No Data Avaliable",
             month: new Date().getMonth() + 1,
-            note_data: "<p>Hello</p>",
+            note_data: "<p>No Data Avaliable</p>",
             email_status: false,
             investor_view: false,
             last_emailed: "",
             last_updated: "",
             year: 2021,
-            startup_id: "startup-1slug",
+            startup_id: "",
           });
         }
       })
@@ -154,8 +154,9 @@ const NotesPage = (props: PropsInterface) => {
               currentMonth={currentMonth}
               setCurrentMonth={(month: string) => setCurrentMonth(month)}
               setNoteData={(val: NoteDataInterface) => setnoteData(val)}
-              noteData={noteData}
-              saveChangeHandler={(val: NoteDataInterface) => updateData(val)}
+              noteData={null}
+              saveChangeHandler={(val: NoteDataInterface) => {}}
+              preview={noteData}
             />
           ) : (
             <CircularProgress />

src/Components/InvestorScreen/InvestorScreen.tsx

@@ -106,10 +106,10 @@ const InvestorScreen = () => {
   const renderCurrentView = (view: string | undefined) => {
     switch (view) {
       case "settings":
-        return (
-          <SettingsView
-            investorInfo={{ Header: "investor 1", accessor: "investor-1slug" }}
-          />
+        return appContext?.userInfo ? (
+          <SettingsView investorInfo={appContext?.userInfo} />
+        ) : (
+          <div></div>
         );
       // case "portfolio":
       //   return <Portfolio />;
@@ -133,7 +133,7 @@ const InvestorScreen = () => {
       appContext?.token,
       "investment",
       "",
-      "investor-1slug"
+      appContext?.userInfo?.accessor
     )
       .then((res) => {
         let options = extractStartupsInvested(res.data);

src/Components/StartupScreen/HomeView/HomeView.tsx

@@ -73,16 +73,16 @@ const HomeView = () => {
   const renderCurrentPage = (page: string | undefined) => {
     switch (page) {
       case "notes":
-        return (
-          <NotesPage
-            selectedStartup={{ Header: "Startup 1", accessor: "startup-1slug" }}
-          />
+        return appContext?.userInfo ? (
+          <NotesPage selectedStartup={appContext.userInfo} />
+        ) : (
+          <div></div>
         );
       default:
-        return (
-          <MetricsPage
-            selectedStartup={{ Header: "Startup 1", accessor: "startup-1slug" }}
-          />
+        return appContext?.userInfo ? (
+          <MetricsPage selectedStartup={appContext.userInfo} />
+        ) : (
+          <div></div>
         );
     }
   };

src/Components/StartupScreen/SettingsView/SettingsView.tsx

@@ -75,10 +75,10 @@ const SettingsView = () => {
   const renderCurrentPage = (page: string | undefined) => {
     switch (page) {
       case "profile":
-        return (
-          <ProfileSettings
-            selectedStartup={{ Header: "Startup 1", accessor: "startup-1slug" }}
-          />
+        return appContext?.userInfo ? (
+          <ProfileSettings selectedStartup={appContext.userInfo} />
+        ) : (
+          <div></div>
         );
       default:
         return <div></div>;