Skip to content

merging feature/anon-auth into dev #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnimatorJoe wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

merging feature/anon-auth into dev #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80742a4
lmfao
AnimatorJoe Oct 29, 2021
5d6656f
merge conflict lmao
Jan 7, 2022
2b1c9c6
removing non-anon auth requirement
Jan 7, 2022
a789578
button lol
Jan 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/SearchbarComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const SearchbarComponent = ({
size={23}
onPress={onSettingsPress}
/>
{Constants.manifest.extra.requireAuth &&
{false &&
<IconButton
icon='account-outline'
color={Colors.grey800}
Expand Down
13 changes: 8 additions & 5 deletions screens/AuthenticationScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import React, { useEffect, useState } from "react";
import * as WebBrowser from "expo-web-browser";
import * as Google from "expo-auth-session/providers/google";
import { StyleSheet, View, Text, Image } from "react-native";
import { Button } from "react-native-paper";
import { Colors, Button } from "react-native-paper";
import { Platform } from "react-native";

import * as firebase from "firebase";
import { getAuth, signInAnonymously } from "firebase/auth";
import * as GoogleSignIn from "expo-google-sign-in";
import { LinearGradient } from "expo-linear-gradient";
import TypeWriter from "react-native-typewriter";
Expand Down Expand Up @@ -136,15 +137,17 @@ const AuthenticationScreen = props => {
<Button
mode='contained'
color='white'
uppercase={true}
icon={"walk"}
disabled={!request}
style={{ display: "flex", flexDirection: "column" }}
labelStyle={{ color: Colors.grey700 }}
onPress={() => {
login();
firebase.auth().signInAnonymously();
}}
>
<Image source={googleGImg} style={{ width: 15, height: 15 }} />
<Text> </Text>
Sign In with Google
Lets Stroll!
</Button>
</View>
<View style={styles.mainBackgroundEnd}>
Expand Down Expand Up @@ -180,7 +183,7 @@ const AuthenticationScreen = props => {
</Svg>
<View style={styles.copyright}>
<Text style={{ fontSize: 13, color: "#777", fontWeight: "500" }}>
Copyright © 2021 Stroll, All rights reserved.
Copyright © 2022 Stroll, All rights reserved.
</Text>
</View>
</View>
Expand Down