Skip to content

Commit

Permalink
eslint and comment updates
Browse files Browse the repository at this point in the history
  • Loading branch information
lcflight committed Feb 12, 2024
1 parent d89b827 commit 923b82c
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 57 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
block-navigation.js
prettify.js
sorter.js
android/app/build/
5 changes: 0 additions & 5 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ import {enableScreens} from 'react-native-screens';
import {WithSplashScreen} from './components/splash';
import Authenticated from './screens/Authenticated';
import HomeScreen from './screens/HomeScreen';
import LoginScreen from './screens/LoginScreen';
import ProfileScreen from './screens/ProfileScreen';
import {firebaseConfig} from './services/firebaseConfig';
import useMe from './services/taskratchet/useMe';

initializeApp(firebaseConfig);
getAuth();
Expand All @@ -24,8 +22,6 @@ const queryClient = new QueryClient();
const Stack = createStackNavigator();

function App(): JSX.Element {
// const {isFetching} = useMe();

return (
<WithSplashScreen isAppReady={true}>
<NavigationContainer>
Expand All @@ -35,7 +31,6 @@ function App(): JSX.Element {
screenOptions={{
headerShown: false,
}}>
{/* <Stack.Screen name="LoginScreen" component={LoginScreen} /> */}
<Stack.Screen name="HomeScreen" component={HomeScreen} />
<Stack.Screen name="ProfileScreen" component={ProfileScreen} />
</Stack.Navigator>
Expand Down
7 changes: 0 additions & 7 deletions src/screens/Authenticated.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
import React from 'react';
import {Text} from 'react-native';

import useMe from '../services/taskratchet/useMe';
import LoginScreen from './LoginScreen';

export default function Authenticated({children}: {children: React.ReactNode}) {
const {data, isError} = useMe();

console.log('me:', data);

// if (me.isPending) {
// return <Text style={{color: 'black'}}>Loading...</Text>;
// }

if (!data || isError) {
return <LoginScreen />;
}
Expand Down
11 changes: 2 additions & 9 deletions src/screens/LoginScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
import {
QueryClient,
useMutation,
useQuery,
useQueryClient,
} from '@tanstack/react-query';
import {useMutation, useQueryClient} from '@tanstack/react-query';
import React from 'react';
import {
Image,
Expand All @@ -23,15 +18,13 @@ import helpIconWhite from '../../assets/icons/help_circle(white).png';
import logoBordered from '../../assets/images/logo_taskratchet_512_bordered.png';
import logo from '../../assets/images/[email protected]';
import PressableLoading from '../components/pressableLoading';
import {Props} from '../components/types';
import themeProvider from '../providers/themeProvider';
import {getTasks} from '../services/taskratchet/getTasks';
import {login} from '../services/taskratchet/login';
import {styles} from '../styles/loginScreenStyle';
import useIsDarkMode from '../utils/checkDarkMode';
import {handleHelpButtonPress} from '../utils/handleHelpButtonPress';

export default function LoginScreen({navigation}: Props): JSX.Element {
export default function LoginScreen(): JSX.Element {
const isDarkMode = useIsDarkMode();

const backgroundStyle = {
Expand Down
10 changes: 0 additions & 10 deletions src/screens/ProfileScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,7 @@ export default function ProfileScreen({navigation}: Props) {
async function handleLogoutPress() {
await logout()
.then(async () => {
// console.log('clearing queryClient');
// queryClient.clear();
// console.log('refetching queries');
// await queryClient.refetchQueries();
console.log('resetting queries');
await queryClient.resetQueries();
console.log('queries reset');

// console.log('invalidating queries');
// await queryClient.invalidateQueries();
// console.log('queriy invalidation complete');
})
.catch(error => {
console.error(`Error logging out: ${String(error)}`);
Expand Down
1 change: 0 additions & 1 deletion src/services/taskratchet/getMe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export type User = {

export async function getMe(): Promise<User> {
const response = await fetch1('me', true);
console.log('getMe() response', response);

if (!response.ok) {
throw new Error('Failed to get me');
Expand Down
24 changes: 0 additions & 24 deletions src/services/taskratchet/login.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,13 @@ import fetch1 from './fetch1';
import {publishSession} from './sessions';

let _auth: Auth;
let _listenerSet = false;

function _getAuth() {
if (!_auth) {
const app = initializeApp(firebaseConfig);
_auth = getAuth(app);
}

if (!_listenerSet) {
onAuthStateChanged(_auth, user => {
if (user) {
RNSecureKeyStore.set('authState', JSON.stringify(user), {
accessible: ACCESSIBLE.ALWAYS_THIS_DEVICE_ONLY,
}).catch(error => {
console.error(`Error setting authState: ${String(error)}`);
});
} else {
RNSecureKeyStore.get('authState')
.then(() => {
RNSecureKeyStore.remove('authState').catch(error => {
console.error(`Error removing authState: ${String(error)}`);
});
})
.catch(() => {
// No authState is set. No action needed.
});
}
});
_listenerSet = true;
}

return _auth;
}

Expand Down
1 change: 0 additions & 1 deletion src/services/taskratchet/useMe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ import {useQuery} from '@tanstack/react-query';
import {getMe} from './getMe';

export default function useMe() {
console.log('useMe running...');
return useQuery({queryKey: ['user'], queryFn: getMe});
}

0 comments on commit 923b82c

Please sign in to comment.