fix the edit and remove auto logout and fix dialog bug

milon27 · Dec 19, 2021 · fb65341 · fb65341
1 parent b911e68
commit fb65341
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 99 deletions.
diff --git a/package.json b/package.json
@@ -10,30 +10,30 @@
     "eject": "expo eject"
   },
   "dependencies": {
-    "@expo-google-fonts/lobster-two": "^0.2.0",
-    "@react-native-async-storage/async-storage": "^1.13.0",
+    "@expo-google-fonts/lobster-two": "0.2.0",
+    "@react-native-async-storage/async-storage": "1.13.0",
     "@react-native-community/masked-view": "0.1.10",
-    "@react-navigation/drawer": "^5.12.5",
-    "@react-navigation/native": "^5.9.4",
-    "@react-navigation/stack": "^5.14.5",
-    "axios": "^0.21.1",
-    "crypto-es": "^1.2.7",
-    "expo": "~41.0.1",
-    "expo-clipboard": "~1.0.2",
-    "expo-status-bar": "~1.0.4",
+    "@react-navigation/drawer": "5.12.5",
+    "@react-navigation/native": "5.9.4",
+    "@react-navigation/stack": "5.14.5",
+    "axios": "0.21.1",
+    "crypto-es": "1.2.7",
+    "expo": "41.0.1",
+    "expo-clipboard": "1.0.2",
+    "expo-status-bar": "1.0.4",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-native": "https://github.com/expo/react-native/archive/sdk-41.0.0.tar.gz",
-    "react-native-dropdown-picker": "^5.1.21",
-    "react-native-gesture-handler": "~1.10.2",
-    "react-native-reanimated": "~2.1.0",
+    "react-native-dropdown-picker": "5.1.21",
+    "react-native-gesture-handler": "1.10.2",
+    "react-native-reanimated": "2.1.0",
     "react-native-safe-area-context": "3.2.0",
-    "react-native-screens": "~3.0.0",
-    "react-native-vector-icons": "^8.1.0",
-    "react-native-web": "~0.13.12"
+    "react-native-screens": "3.0.0",
+    "react-native-vector-icons": "8.1.0",
+    "react-native-web": "0.13.12"
   },
   "devDependencies": {
-    "@babel/core": "^7.9.0"
+    "@babel/core": "7.9.0"
   },
   "private": true
-}
+}
diff --git a/src/components/layouts/modal/PasswordModal.js b/src/components/layouts/modal/PasswordModal.js
@@ -1,5 +1,5 @@
 import React, { useContext, useState, useEffect } from 'react'
-import { View, Text, StyleSheet } from 'react-native'
+import { Text, StyleSheet } from 'react-native'
 import MModal from './MModal'
 import Theme from './../../../utils/helpers/Theme';
 import ListAction from './../../../utils/context/actions/ListAction';
@@ -22,7 +22,6 @@ export default function PasswordModal({ open, setOpen, item }) {
         let mounted = true
         const load = async () => {
             try {
-
                 const password = await Helper.decryptPass(item?.password)
                 if (mounted === true) {
                     //console.log("mounted=== ", mounted);
@@ -32,14 +31,14 @@ export default function PasswordModal({ open, setOpen, item }) {
                 console.log("model: ", e);
             }
         }
-        if (isFocused === true) {
+        if (isFocused === true && open === true) {
             load()
         }
         return () => {
             mounted = false
         }
 
-    }, [isFocused])
+    }, [isFocused, open])
 
     const onSubmit = () => {
         setOpen(false)

diff --git a/src/components/navigation/AppNavContainer.js b/src/components/navigation/AppNavContainer.js
@@ -1,49 +1,18 @@
-import React, { useContext, useState, useEffect, useRef } from 'react'
+import React, { useContext, useState, useEffect } from 'react'
 import { NavigationContainer } from '@react-navigation/native';
 import AuthNav from './AuthNav';
 import DashDrawNav from './DashDrawNav';
 import Splash from './../screens/splash/Splash';
 import { DispatchContext, StateContext } from './../../utils/context/MainContext';
 import AuthAction from './../../utils/context/actions/AuthAction';
 import Helper from './../../utils/helpers/Helper';
-import { AppState } from 'react-native';
-import useAsyncStorage from './../../utils/helpers/hooks/useAsyncstorage';
 
 export default function AppNavContainer() {
 
     const { auth, } = useContext(StateContext)
     const { authDispatch } = useContext(DispatchContext)
     const [loading, setLoading] = useState(true)
 
-    const [offline, setOffline] = useAsyncStorage("OFFLINE_TIME", new Date().getTime())
-
-
-
-
-    //app state
-    const _handleAppStateChange = async (nextAppState) => {
-        //appState.current.match(/inactive|background/) &&
-        if (
-            nextAppState === 'active'
-        ) {
-            const ctime = new Date().getTime()
-            if (Math.abs(ctime - offline) > 30000) {
-                //if (auth?.logged_in) {
-                console.log("it was background for more than 30 seconds");
-                await new AuthAction(authDispatch).Logout()
-                //do logout
-                Helper.Toast("logged out for inactivity.")
-                // }
-            } else {
-                console.log("Diff=", Math.abs(ctime - offline));
-            }
-        } else {
-            const ctime = new Date().getTime()
-            console.log("App is in background!", ctime);
-            //set time in localstorage. when app goes to backgroud
-            setOffline(ctime)
-        }
-    }
 
     useEffect(() => {
         const load = async () => {
@@ -68,17 +37,9 @@ export default function AppNavContainer() {
 
             setTimeout(() => {
                 setLoading(false)
-            }, 300);
+            }, 10);
         }
         load()
-
-        //state change listener
-        AppState.addEventListener('change', _handleAppStateChange)
-
-        return () => {
-            AppState.removeEventListener('change', _handleAppStateChange);
-        }
-
     }, [])
 
 

diff --git a/src/components/screens/category/AllCat.js b/src/components/screens/category/AllCat.js
@@ -19,8 +19,7 @@ export default function AllCat() {
         const token = AxiosHelper.getSource()
         const load = async () => {
             try {
-                const uid = await Helper.getUserID()
-                const data = await AxiosHelper.getData(`pass/get-all-cat/${uid}/`, token)
+                const data = await AxiosHelper.getData(`pass/get-all-cat/`, token)
                 if (data.success) {
                     // console.log("data:", data)
                     setCat(data.object)

diff --git a/src/components/screens/dashboard/ContactDetail.js b/src/components/screens/dashboard/ContactDetail.js
@@ -13,6 +13,11 @@ import OfflineListAction from './../../../utils/context/actions/OfflineListActio
 import Define from '../../../utils/helpers/Define';
 import { DispatchContext } from '../../../utils/context/MainContext';
 
+/**
+ * 
+ * @param {*} param0 
+ * @returns not used in this project.
+ */
 export default function ContactDetail({ route: { params } }) {
     const { navigate, setOptions } = useNavigation()
 

diff --git a/src/components/screens/dashboard/CreateCategory.js b/src/components/screens/dashboard/CreateCategory.js
@@ -10,6 +10,7 @@ import { StateContext } from './../../../utils/context/MainContext';
 import Theme from './../../../utils/helpers/Theme';
 import AxiosHelper from './../../../utils/helpers/AxiosHelper';
 import { StatusBar } from 'expo-status-bar';
+
 export default function CreateCategory() {
     const { app } = useContext(StateContext)
     const [title, setTitle] = useState("")
@@ -20,8 +21,8 @@ export default function CreateCategory() {
             setError("Enter category title.")
             return
         }
-        const userId = await Helper.getUserID()
-        let val = await AxiosHelper.addData('pass/create-cat', { title, user: userId })
+
+        let val = await AxiosHelper.addData('pass/create-cat', { title })
         console.log("CreateCategory", val)
         if (val.success) {
             setTitle("")

diff --git a/src/components/screens/dashboard/CreatePassword.js b/src/components/screens/dashboard/CreatePassword.js
@@ -25,7 +25,7 @@ export default function CreatePassword({ route: { params }, navigation }) {
     const { app } = useContext(StateContext)
     const { appDispatch } = useContext(DispatchContext)
 
-    const [value, setValue] = useState([]);
+    const [value, setValue] = useState(null);//single : null, multi: []
     const [open, setOpen] = useState(false);
 
     const titleRef = useRef(null)
@@ -39,7 +39,6 @@ export default function CreatePassword({ route: { params }, navigation }) {
     const N_PASSWORD = "password"
     const N_EMAIL = "email"
     const N_USERNAME = "username"
-    const N_USER = "user"
     const N_OTHER = "other"
     const N_CAT = "category"
     const N_IS_FAV = "is_fav"
@@ -51,7 +50,6 @@ export default function CreatePassword({ route: { params }, navigation }) {
         [N_USERNAME]: item[N_USERNAME] || "",
         [N_PASSWORD]: "",
         [N_OTHER]: item[N_OTHER] || "",
-        [N_USER]: item[N_USER] || "",
         [N_IS_FAV]: item[N_IS_FAV] || false,
     } : {
         [N_TITLE]: "",
@@ -60,7 +58,6 @@ export default function CreatePassword({ route: { params }, navigation }) {
         [N_USERNAME]: "",
         [N_PASSWORD]: "",
         [N_OTHER]: "",
-        [N_USER]: "",
         [N_IS_FAV]: false,
     }
     const clear_init = {
@@ -70,7 +67,6 @@ export default function CreatePassword({ route: { params }, navigation }) {
         [N_USERNAME]: "",
         [N_PASSWORD]: "",
         [N_OTHER]: "",
-        [N_USER]: "",
         [N_IS_FAV]: false,
     }
 
@@ -94,14 +90,14 @@ export default function CreatePassword({ route: { params }, navigation }) {
                     })
                     const pass = await Helper.decryptPass(item[N_PASSWORD])
                     setInput({ ...input, [N_PASSWORD]: pass })
-                    setValue(item[N_CAT]);
+                    //console.log("all cat of the current item-", item[N_CAT])//get 1st one.
+                    setValue(item[N_CAT][0]);//set old category. or selected item.
                 }
 
-                const uid = await Helper.getUserID()
-                const data = await AxiosHelper.getData(`pass/get-all-cat/${uid}/`, token)
+                const data = await AxiosHelper.getData(`pass/get-all-cat/`, token)
                 if (data.success) {
-                    //console.log("cat: ", data.object)
-                    setCat(data.object)
+                    //console.log("pass/get-all-cat/: ", data.object)//[]
+                    setCat(data.object)//set the cat list in dropdown
                 }
             } catch (e) {
                 console.log("error Create Password.js->", e);
@@ -141,7 +137,6 @@ export default function CreatePassword({ route: { params }, navigation }) {
         const data = {
             ...input,
             [N_PASSWORD]: await Helper.encryptPass(input[N_PASSWORD]),
-            [N_USER]: await Helper.getUserID(),
             [N_CAT]: value
         }
 
@@ -163,7 +158,7 @@ export default function CreatePassword({ route: { params }, navigation }) {
         appac.STOP_LOADING()
         if (val.success) {
             setInput(clear_init)
-            setValue([])
+            setValue(null)
             Helper.Toast("" + val.desc)
         } else {
             Helper.Toast("" + val.desc)
@@ -246,7 +241,7 @@ export default function CreatePassword({ route: { params }, navigation }) {
 
                     theme={Theme.STATUS_BAR_ALT.toUpperCase()}
 
-
+                    multiple={false}
                     open={open}
                     setOpen={setOpen}
                     value={value}

diff --git a/src/components/screens/dashboard/HomeScreen.js b/src/components/screens/dashboard/HomeScreen.js
@@ -41,8 +41,7 @@ export default function HomeScreen() {
         const token = AxiosHelper.getSource()
         const load = async () => {
             try {
-                const uid = await Helper.getUserID()
-                const data = await AxiosHelper.getData(`pass/get-all-cat/${uid}/`, token)
+                const data = await AxiosHelper.getData(`pass/get-all-cat/`, token)
                 if (data.success) {
                     // console.log("data:", data)
                     setCat(old => {
@@ -75,11 +74,10 @@ export default function HomeScreen() {
             try {
                 //load password..
                 appac.START_LOADING()
-                const uid = await Helper.getUserID()
                 if (select === "all_cat") {
-                    await listAc.getAll(`pass/get-all/${uid}/`, [])
+                    await listAc.getAll(`pass/get-all/`, [])
                 } else {
-                    await listAc.getAll(`pass/get-all/${uid}/${select}`, [])
+                    await listAc.getAll(`pass/get-all/${select}`, [])
                 }
                 // const val =
                 //console.log("home pass val =", val)
@@ -96,7 +94,7 @@ export default function HomeScreen() {
         return () => {
             token.cancel()
         }
-    }, [isFocused, select, pass.length])
+    }, [isFocused, select])
 
 
     const renderItem = ({ item }) => {

diff --git a/src/components/screens/dashboard/SingleRow.js b/src/components/screens/dashboard/SingleRow.js
@@ -9,9 +9,11 @@ import PasswordModal from './../../layouts/modal/PasswordModal';
 import AreYouSureModal from './../../layouts/modal/AreYouSureModal';
 
 export default function SingleRow({ item }) {
+    const [modalItem, setModalItem] = useState(null)
     const [open, setOpen] = useState(false)
     const [open1, setOpen1] = useState(false)
     const onPress = () => {
+        setModalItem(item)
         setOpen(true)
     }
 
@@ -25,7 +27,7 @@ export default function SingleRow({ item }) {
     return <TouchableOpacity onPress={onPress} onLongPress={onLongPress} style={styles.item_container}>
         {/* {console.log("row -> ", item)} */}
 
-        <PasswordModal setOpen={setOpen} open={open} item={item} />
+        <PasswordModal setOpen={setOpen} open={open} item={modalItem} />
         <AreYouSureModal setOpen={setOpen1} open={open1} submitText="Delete Password" onSubmit={onDelete} />
 
         <View style={{ flexDirection: "row", alignItems: "center" }}>

diff --git a/src/components/screens/favourite/Fav.js b/src/components/screens/favourite/Fav.js
@@ -7,8 +7,8 @@ import Theme from '../../../utils/helpers/Theme';
 import Container from './../../layouts/Container';
 import ListAction from './../../../utils/context/actions/ListAction';
 import AppAction from './../../../utils/context/actions/AppAction';
-import Helper from './../../../utils/helpers/Helper';
 import { StatusBar } from 'expo-status-bar';
+
 export default function Fav() {
 
     const isFocused = useIsFocused();
@@ -26,8 +26,7 @@ export default function Fav() {
             try {
                 //load password..
                 appac.START_LOADING()
-                const uid = await Helper.getUserID()
-                const val = await listAc.getAll(`pass/get-all-fav/${uid}/`, [])
+                const val = await listAc.getAll(`pass/get-all-fav/`, [])
                 //console.log("fav pass val =", val)
                 appac.STOP_LOADING()
             } catch (e) {

diff --git a/src/components/screens/password/ChangePassword.js b/src/components/screens/password/ChangePassword.js
@@ -33,7 +33,6 @@ export default function ChangePassword() {
         [N_NEW_C_PASSWORD]: "",
     }
     //state
-    const [uid, setUid] = useState("")
     const [input, setInput] = useState(initValue)
     const [error, setError] = useState(initValue)
     //effect
@@ -45,9 +44,7 @@ export default function ChangePassword() {
 
             try {
                 //load password..
-                const uid = await Helper.getUserID()
-                setUid(uid)
-                const val = await listAc.getAll(`pass/get-all/${uid}/`, [])
+                const val = await listAc.getAll(`pass/get-all/`, [])
                 //console.log("change pass val =", val)
             } catch (e) {
                 console.log("error ChangePassword.js->", e);
@@ -109,7 +106,6 @@ export default function ChangePassword() {
         const data = {
             arr: resultArray,
             user: {
-                _id: uid,
                 pass: input[N_NEW_PASSWORD]
             }
         }