@boneframework/native-components 1.0.12 → 1.0.14

package/components/ActivityIndicator.js

@@ -35,7 +35,7 @@ function ActivityIndicator({ visible = false , type="default"}) {
     return (
         <View style={style}>
             <Animation
-                source={require.main.require('assets/animations/loader.json')}
+                source={require('../../../../assets/animations/loader.json')}
                 autoPlay={true}
                 loop={true}
                 style={{height: 100, width: 100, opacity: 1}}

package/contexts/auth.ts

@@ -0,0 +1,17 @@
+import { createContext } from "react";
+
+const AuthContext = createContext<{
+    login: () => void;
+    logout: () => void;
+    updateUser: () => void;
+    user?: object | null;
+    isLoading: boolean;
+}>({
+    login: () => null,
+    logout: () => null,
+    updateUser: () => null,
+    user: null,
+    isLoading: false,
+});
+
+export default AuthContext;

package/hooks/{useAuth.js → useAuth.ts}

@@ -1,4 +1,4 @@
-import {useContext} from "react";
+import {useContext, useState} from "react";
 
 import AuthContext from "../contexts/auth";
 import authStorage from "../utilities/authStorage";
@@ -8,23 +8,27 @@ import usersApi from "../api/users";
 export default useAuth = () => {
     const profileApi = useApi(usersApi.getProfile);
     const {user, setUser} = useContext(AuthContext);
+    const {isLoading, setIsLoading} = useState(false);
 
     const login = async authToken => {
-        // possibly don't wait here?
+        setIsLoading(true);
         await authStorage.storeAuthToken(authToken).then(async () => {
             const user = await profileApi.request(authToken);
             authStorage.storeUser(user.data);
             user.data.authToken = authToken;
             setUser(user.data);
+            setIsLoading(false);
         });
     }
 
     const updateUser = async user => {
+        setIsLoading(true);
         const authToken = user.authToken;
         await delete user.authToken;
         authStorage.storeUser(user);
         user.authToken = authToken;
         setUser({...user});
+        setIsLoading(false);
     }
 
     const logout = () => {
@@ -33,5 +37,5 @@ export default useAuth = () => {
         authStorage.removeUser();
     }
 
-    return {login, logout, updateUser, user};
+    return {login, logout, updateUser, user, isLoading};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boneframework/native-components",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "description": "Expo Components for Bone Framework",
   "main": "src/Bone.ts",
   "scripts": {

package/screens/RegisterScreen.tsx

@@ -39,12 +39,12 @@ function RegisterScreen({postRegisterUrl}) {
     return (
         <>
         <ActivityIndicator visible={registerApi.loading} type={'overlay'}/>
-        <ImageBackground blurRadius={10} style={styles.background} source={require.main.require('assets/background.png')} >
+        <ImageBackground blurRadius={10} style={styles.background} source={require('../../../../assets/background.png')} >
             <View style={styles.container}>
                 <TouchableOpacity style={styles.cancelButton} onPress={onClose}>
                     <Icon size={75} name={'close'} />
                 </TouchableOpacity>
-                <Image style={styles.logo} source={require.main.require('assets/logo.png')} />
+                <Image style={styles.logo} source={require('../../../../assets/logo.png')} />
 
                 <Form
                     initialValues={{ email: ''}}

package/screens/WelcomeScreen.tsx

@@ -7,9 +7,9 @@ import colors from '../../../../config/colors'
 
 function WelcomeScreen({loginOnPress = () => {}, registerOnPress = () => {}, title = 'BONE FRAMEWORK'}) {
     return (
-        <ImageBackground blurRadius={10} style={styles.background} source={require.main.require('assets/background.png')} >
+        <ImageBackground blurRadius={10} style={styles.background} source={require('../../../../assets/background.png')} >
             <View style={styles.logoContainer}>
-                <Image style={styles.logo} source={require.main.require('assets/logo.png')} />
+                <Image style={styles.logo} source={require('../../../../assets/logo.png')} />
                 <Text style={styles.tagline}>{ title }</Text>
             </View>
             <View style={styles.buttonContainer}>

package/contexts/auth.js

@@ -1,5 +0,0 @@
-import React from "react";
-
-const AuthContext = React.createContext();
-
-export default AuthContext;