diff --git a/Views/Feed.js b/Views/Feed.js index f950f8b..7b3ef20 100644 --- a/Views/Feed.js +++ b/Views/Feed.js @@ -41,7 +41,7 @@ const handleURL = (url, navigation) => { if (path === 'alert') { alert(queryParams.str); } else { - alert(path + " ::: " + queryParams); + //alert(path + " ::: " + queryParams); } } diff --git a/Views/Invite.js b/Views/Invite.js index 998beb4..2160936 100644 --- a/Views/Invite.js +++ b/Views/Invite.js @@ -4,6 +4,15 @@ import { Text, TextInput, Button, Divider, Checkbox } from "react-native-paper"; import i18n from "../i18nMessages.js"; import API from "../API"; +const validateEmail = (text) => { + let reg = /^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w\w+)+$/; + if (reg.test(text) === false) { + console.log("Email is Not Correct"); + return false; + } + return true; + } + let InviteView = ()=>{ const [name, setName] = React.useState(""); @@ -11,11 +20,24 @@ let InviteView = ()=>{ const [checked, setChecked] = React.useState(""); let sendInvite = async () => { - if(name != "" && email != "") return 0; + if(name == "" || email == "" || !checked){ + alert("Please make sure to fill all the inputs"); + return 0; + } + if(!validateEmail(email)){ + alert("Please input a valid email"); + return 0; + } + const response = await API.newInvitation(name, email); + if(response?.status !== "ok"){ + alert(response.status); + return 0; + } + //console.log(response); setName(''); setEmail(''); setChecked(false); - await API.newInvitation(name, email); + alert("Invitation sent, thank you!"); } return ( @@ -39,6 +61,10 @@ let InviteView = ()=>{ style={{backgroundColor:"rgba(0,0,0,0)"}} value={email} onChangeText={text => setEmail(text)} + autoCapitalize='none' + autoComplete='email' + autoCorrect={false} + keyboardType='email-address' /> { onPress={()=>{setChecked(!checked)}} /> - + ) diff --git a/Views/NewPost.js b/Views/NewPost.js index 8b07e9b..58c133f 100644 --- a/Views/NewPost.js +++ b/Views/NewPost.js @@ -89,7 +89,7 @@ let NewPostView = (props) => { } catch (err) { console.log(err); - alert("Something went wrong"); + alert("Something went wrong uploading the photo."); } }); uploadedFiles = Promise.all(allUploads); diff --git a/Views/ProfileSettings.js b/Views/ProfileSettings.js index 2afb798..5038af1 100644 --- a/Views/ProfileSettings.js +++ b/Views/ProfileSettings.js @@ -74,7 +74,7 @@ let ProfileSettings = ()=>{ .catch((err) => console.error(err)); } catch (err) { console.log(err); - alert("Something went wrong"); + alert("Something went wrong uploading the photo."); } return uploadedFile; };