Skip to content

Commit

Permalink
ran prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
danny-zou18 committed Oct 25, 2024
1 parent b099bda commit c781882
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 10 deletions.
4 changes: 1 addition & 3 deletions lifescape-app/app.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
"output": "static",
"favicon": "./assets/images/favicon.png"
},
"plugins": [
"expo-router"
],
"plugins": ["expo-router"],
"experiments": {
"typedRoutes": true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const FriendRequests = () => {
{loading ? (
<ActivityIndicator color="#0000ff" />
) : (
<ScrollView className="w-full bg-red-400 mt-2 flex flex-col gap-2">
<ScrollView className="mt-2 flex w-full flex-col gap-2 bg-red-400">
{friendRequests.map((friendRequest) => (
<IndividualFriendRequest
key={friendRequest.id}
Expand Down
2 changes: 1 addition & 1 deletion lifescape-app/components/friends/FriendsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const FriendsList = () => {
}, [user, refresh]);

return (
<View className="w-full mt-5">
<View className="mt-5 w-full">
{loading ? (
<ActivityIndicator size="large" color="white" />
) : (
Expand Down
4 changes: 2 additions & 2 deletions lifescape-app/components/friends/IndividualFriend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ interface IndividualFriendProps {

const IndividualFriend: React.FC<IndividualFriendProps> = ({ friendData }) => {
return (
<View className="bg-blue-400 rounded-md">
<View className="rounded-md bg-blue-400">
<Link
className="p-4 w-full h-full"
className="h-full w-full p-4"
href={`/overview/friends/friend/${friendData.user_id}`}
>
<Text>{friendData.user_username}</Text>
Expand Down
4 changes: 2 additions & 2 deletions lifescape-app/components/friends/IndividualFriendRequest.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ const IndividualFriendRequest: React.FC<IndividualFriendRequestProps> = ({
<>
<TouchableHighlight
onPress={acceptFriendRequest}
className="p-2 bg-green-400 rounded-full"
className="rounded-full bg-green-400 p-2"
underlayColor="#278a3e"
>
<Ionicons name="checkmark-sharp" size={24} color="black" />
</TouchableHighlight>
<TouchableHighlight
onPress={rejectFriendRequest}
className="p-2 bg-red-500 rounded-full"
className="rounded-full bg-red-500 p-2"
underlayColor="#8a2424"
>
<Ionicons name="close" size={24} color="black" />
Expand Down
2 changes: 1 addition & 1 deletion lifescape-app/context/GlobalProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const GlobalProvider: React.FC<{ children: ReactNode }> = ({ children }) => {
});
if (response.status === 200) {
setUserCharacter(response.data);
}
}
} catch (error) {
if (isAxiosError(error)) {
// AxiosError type will have a response property
Expand Down

0 comments on commit c781882

Please sign in to comment.