Skip to content

Commit

Permalink
create first time sign on screen
Browse files Browse the repository at this point in the history
  • Loading branch information
yffenim committed May 26, 2022
1 parent 7faeab9 commit 2eb1f87
Show file tree
Hide file tree
Showing 44 changed files with 452 additions and 532 deletions.
4 changes: 3 additions & 1 deletion App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import {
AlertnessNavigator,
SecondsNavigator,
ThirdsNavigator,
ExportNavigator
ExportNavigator,
FirstNavigator
} from './src/containers/NavigationScreens'
import {
RecoilRoot,
Expand Down Expand Up @@ -51,6 +52,7 @@ export default class App extends React.Component {
{AlertnessNavigator}
{SecondsNavigator}
{ThirdsNavigator}
{FirstNavigator}
{/*
Add Toggle Dark Mode Here?
Add Export Data Here?
Expand Down
4 changes: 4 additions & 0 deletions helpers/consolelog.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
export default function l(arg1, arg2) {
( arg1, arg2 ) ? console.log(arg1, arg2) : console.log(arg1)
}

// export default function l(arg1, arg2){
// console.log("logging is off");
// }
1 change: 1 addition & 0 deletions helpers/devID.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const devID = 7;
2 changes: 1 addition & 1 deletion src/atoms/headersAtom.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { atom } from "recoil";
// request header
export const headersAtom = atom({
key: "headersAtom",
default: {"uid": "default"}
default: {"default": "default"}
});


2 changes: 1 addition & 1 deletion src/atoms/momentsAtom.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { atom } from "recoil";

// which model to be passed into the fetchModelSelector
// NOT CURRENTLY IN USE
export const momentsAtom = atom({
key: "momentsAtom",
default: {}
Expand Down
1 change: 1 addition & 0 deletions src/atoms/secondsAtom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { atom } from "recoil";

// passing titles in, NOT DATA
export const secondsAtom = atom({
key: "secondsAtom",
default: "second"
Expand Down
1 change: 1 addition & 0 deletions src/atoms/thirdsAtom.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { atom } from "recoil";

// passing titles in, NOT OBJECTS
export const thirdsAtom = atom({
key: "thirdsAtom",
default: "third"
Expand Down
9 changes: 9 additions & 0 deletions src/atoms/thirdsDataAtom.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { atom } from "recoil";

// passing titles in, NOT OBJECTS
export const thirdsAtom = atom({
key: "thirdsAtom",
default: {}
});


38 changes: 0 additions & 38 deletions src/containers/AddData.jsx

This file was deleted.

88 changes: 0 additions & 88 deletions src/containers/AddEntry-vertical.jsx

This file was deleted.

29 changes: 19 additions & 10 deletions src/containers/AuthButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,43 @@ export const RegisterButton = ({email, password}) => {

// SIGN IN USER
export function SignInButton ({
email, password, setHeaders, setUid, navigation}) {

email, password, setHeaders, setUid, setUser, navigation}) {
const usersURL = "http://localhost:3000/api/users/"

const api = new API;

const handleSignin = () => {
const model = "sessions"

// set login body based on user input
const body = JSON.stringify({
email: email,
password: password
})

// Login, save authenticated headers, make a GET request for User Data, store in Atom state
api.post( model, body)
api.post(model, body)
.then(headers => {
setHeaders(headers);
l("Login callback headers: ", headers);
let uid = headers["uid"];
setUid(uid);
navigation.navigate("Add Entry");
navigation.navigate("First");
// navigation.navigate("Add Entry");
})
.catch(error => {
console.error(error);
});
}
return (
});

api.get(usersURL)
.then(response => {
// l(response);
setUser(response);
})
.catch(error => {
console.error(error);
});

};
return (
<Button
onPress={() => {
handleSignin()
Expand All @@ -72,7 +81,7 @@ export function SignInButton ({
Sign in New
</Button>
)
}
};


// Return to Login component Link (I know it's not a button)
Expand Down
39 changes: 0 additions & 39 deletions src/containers/EditPressable0.jsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/containers/InputButtons.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { atom, useSetRecoilState } from "recoil";
import l from '../../helpers/consolelog';



// THE DATA ENTRY BUTTONS THEMSEVLES
export function AnimatedButton({color, value, setFirstValue, setSecondValue, setThirdValue, model}) {

// setting state for pressed value
Expand Down
2 changes: 2 additions & 0 deletions src/containers/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ function Login({navigation, setForm}) {
const [password, setPassword] = useState("");
const [headers, setHeaders] = useRecoilState(headersAtom);
const [uid, setUid] = useRecoilState(uidAtom);
const [user, setUser] = useRecoilState(userAtom)

return (
<Box>
Expand All @@ -26,6 +27,7 @@ function Login({navigation, setForm}) {
password={password}
setHeaders={setHeaders}
setUid={setUid}
setUser={setUser}
navigation={navigation}
/>
<NewUserLink setForm={setForm} />
Expand Down
18 changes: 9 additions & 9 deletions src/containers/ModelStats.jsx
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
import React from 'react';
// import { useRecoilValue } from 'recoil';
import { Box, Text, Heading, VStack, HStack, Pressable} from 'native-base';
import { Box, Text, Heading, VStack, HStack, Center, Pressable} from 'native-base';
// import { momentsAtom } from '../atoms/momentsAtom';
import l from '../../helpers/consolelog';


// Display Model Stats Heading
export function ModelStats({avg, count}) {
export function ModelStats({avg, count, model}) {
return (
<Box p="4" mb="5"
bg="coolGray.800"
<Box p="4" borderRadius="2"
bg="darkBlue.900"
>
<VStack space={1}>
<Heading size="md" color="coolGray.200">
Total Alertness Entries: {count}
<Heading size="md" color="darkBlue.50">
total {model} entries: {count}
</Heading>
<Heading size="md" color="coolGray.200">
Your Average Alertness: {avg}
<Heading size="md" color="darkBlue.50">
your average: {avg}
</Heading>
</VStack>
</Box>
</Box>
)
}

Expand Down
17 changes: 16 additions & 1 deletion src/containers/NavigationScreens.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import * as React from "react";
import { createDrawerNavigator } from '@react-navigation/drawer';
import { Entypo, FontAwesome5, Ionicons, Foundation, MaterialCommunityIcons } from '@expo/vector-icons';
import { Entypo, FontAwesome5, Ionicons, Foundation, MaterialCommunityIcons, MaterialIcons } from '@expo/vector-icons';
import LandingScreen from "../screens/LandingScreen";
import UserScreen from "../screens/UserScreen";
import AddDataScreen from "../screens/AddDataScreen";
import AlertnessScreen from "../screens/AlertnessScreen";
import SecondsScreen from "../screens/SecondsScreen";
import ThirdsScreen from "../screens/ThirdsScreen";
import ExportScreen from "../screens/ExportScreen";
import FirstTimeScreen from "../screens/FirstTimeScreen";
import { useRecoilValue } from 'recoil';
import { secondsAtom } from '../atoms/secondsAtom';
import { thirdsAtom } from '../atoms/thirdsAtom';
Expand Down Expand Up @@ -81,6 +82,14 @@ const exportIcon = {
)
};

const firstIcon = {
drawerIcon: ({ focused, size }) => (
<MaterialIcons
name="developer-mode"
size={24} color={iconColor}
/>
)
};

// NAVIGATION STACK OBJECTS

Expand Down Expand Up @@ -137,3 +146,9 @@ export const ExportNavigator =
component={ExportScreen}
/>;

export const FirstNavigator =
<Drawer.Screen
name="First"
options={firstIcon}
component={FirstTimeScreen}
/>;
Loading

0 comments on commit 2eb1f87

Please sign in to comment.